Merge remote-tracking branch 'origin/develop' into develop

src/pages/details/otherStandardDetails/index.vue

@@ -287,6 +287,8 @@
                         class="icon-download2"
                         v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
                     />
+
+                    <el-button v-if="file.fileSuffix='pdf'" type="primary" round>OCR</el-button>
                     <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                   </template>
                   <template v-else>
@@ -306,12 +308,12 @@
                     <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                   </template>
                 </p>
-                <!--                <el-button-->
+<!--                                <el-button-->
-                <!--                  v-if="child.attrField === 'FBGBJBD' || child.attrField === 'SSG' || child.attrField === 'ZQYJG' || child.attrField === 'BPG' || child.attrField === 'ZBJBD' || child.attrField === 'CA'"-->
+<!--                                  v-if="child.attrField === 'FBGBJBD' || child.attrField === 'SSG' || child.attrField === 'ZQYJG' || child.attrField === 'BPG' || child.attrField === 'ZBJBD' || child.attrField === 'CA'"-->
-                <!--                  @click="showItemsModel(child.attrField)"-->
+<!--                                  @click="showItemsModel(child.attrField)"-->
-                <!--                  class="decomposition-btn"-->
+<!--                                  class="decomposition-btn"-->
-                <!--                  icon="icon-separate"-->
+<!--                                  icon="icon-separate"-->
-                <!--                >标准分解单</el-button>-->
+<!--                                >标准分解单</el-button>-->
               </div>
             </div>
 
@@ -383,6 +385,11 @@
                         class="icon-download2"
                         v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
                     />
+<!--                    OCR按钮,根据文件名取后缀判断是否出现-->
+
+                      <el-button v-if="judgeSuffix(file.fileName)" type="primary" size="mini" style="margin: 5px" @click="ocrFunction(file)" plain>OCR</el-button>
+
+
                     <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
                   </template>
                   <template v-else>
@@ -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')) {
+        if (field.attrField === 'XGLC' && !this.$_has('6A52PZCAX8BAUUJ2TSQ4')) {
-        //   return
+          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

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue

@@ -699,115 +699,52 @@ export default {
     cancelStand() {
       this.standModel = false;
     },
-    //如果张宇欢改好了就把这个放开，然后把底下那个注释了
+
-    // okStand() {
+    okStand() {
-    //   let _this = this;
+      let _this = this;
-    //   if (this.standList.length < 1) {
+      if (this.standList.length < 1) {
-    //     _this.$message.warning("请选择标准");
+        _this.$message.warning("请选择标准");
-    //   } else {
+      } else {
-    //     for (let i = 0; i < this.dataList.length; i++) {
+        for (let i = 0; i < this.dataList.length; i++) {
-    //       let newStand = false;
+          let newStand = false;
-    //       for (let j = 0; j < this.standList.length; j++) {
+          for (let j = 0; j < this.standList.length; j++) {
-    //         if (this.standList[j].id == this.dataList[i].standId) {
+            if (this.standList[j].id == this.dataList[i].standId) {
-    //           newStand = true;
+              newStand = true;
-    //           this.standList.splice(j, 1)
+              this.standList.splice(j, 1)
-    //           j--
+              j--
-    //         }
+            }
-    //       }
+          }
-    //       if (newStand) {
+          if (newStand) {
-    //         _this.$message.warning("请勿重复添加数据");
+            _this.$message.warning("请勿重复添加数据");
-    //       } else {
+          } else {
-    //         // _this.dataList.push(item);
+            // _this.dataList.push(item);
-    //       }
+          }
-    //     }
+        }
-    //     this.standardData = []
+        this.standardData = []
-    //     _this.standModel = false;
+        _this.standModel = false;
-    //     for (var i = 0; i < this.standList.length; i++) {
+        for (var i = 0; i < this.standList.length; i++) {
-    //       this.standList1.push({
+          this.standList1.push({
-    //         standId: this.standList[i].id,
+            standId: this.standList[i].id,
-    //         projectId: this.localProEO.id
+            projectId: this.localProEO.id
-    //       })
+          })
-    //     }
+        }
-    //     if (this.standList1 != '') {
+        if (this.standList1 != '') {
-    //       this.$http.postData("sarStandProjectLibrary/batchInsert", this.standList1, {
+          this.$http.postData("sarStandProjectLibrary/batchInsert", this.standList1, {
-    //         _this: this
+            _this: this
-    //       }, res => {
+          }, res => {
-    //         if (res.ok) {
+            if (res.ok) {
-    //           // this.$message.success(res.message)
+              // this.$message.success(res.message)
-    //           this.getDataList()
+              this.getDataList()
-    //         }
+            }
-    //       }, e => {
+          }, e => {
-    //       });
+          });
-    //     }
+        }
-    //     this.standList = []
+        this.standList = []
-    //     this.standList1 = []
+        this.standList1 = []
-    //     _this.standModel = false;
+        _this.detailedListModel = false;
-    //   }
+        _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.standModel = false;
-    //   }
-    // },
     //获取标准
     getStandrd(data){
       this.detailedId = data.id