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

src/components/hzwlComponents/phone/PhoneScroll.vue

@@ -17,17 +17,6 @@
         </div>
       </template>
 
-      <!-- 除上拉和下拉之外的loading -->
-      <van-loading
-          v-if="loading && !pullDownLoading && !pullUpLoading"
-          class="pageLoading"
-          type="spinner"
-          size="16px"
-          text-size="12px"
-          color="#3170A8"
-          style="text-align: center"
-      >加载中...</van-loading>
-
       <slot></slot>
 
       <!-- 上拉加载 -->
@@ -40,12 +29,23 @@
             color="#3170A8"
             style="text-align: center"
         >加载中...</van-loading>
-        <template v-else>
+        <template v-else-if="!loading">
           <div v-if="isShowAll" style="font-size: 12px;text-align: center;color: #999">已加载全部数据</div>
           <van-empty v-if="isEmpty" description="暂无数据" />
         </template>
       </template>
     </div>
+
+    <!-- 除上拉和下拉之外的loading -->
+    <van-loading
+        v-if="loading && !pullDownLoading && !pullUpLoading"
+        class="pageLoading"
+        type="spinner"
+        size="16px"
+        text-size="12px"
+        color="#3170A8"
+        style="text-align: center"
+    >加载中...</van-loading>
   </div>
 </template>
 
@@ -129,6 +129,10 @@ export default {
   },
   watch: {
     data() {
+      if (this.data.length === 0) {
+        this.scrollTo(0,0)
+        this.isEmpty = true
+      }
       this.refreshScroll()
     }
   },
@@ -191,6 +195,7 @@ export default {
     // 下拉刷新回调
     async pullingDownHandler () {
       this.showPullDownText('pullDownLoading')
+      this.hidePullUpText()
 
       // 从第一页获取数据
       await this.getDataHandler(1)
@@ -201,8 +206,7 @@ export default {
     },
 
     showPullUpText () {
-      this.isEmpty = false
+      this.hidePullUpText()
-      this.isShowAll = false
       if (this.data.length === 0) {
         this.isEmpty = true
       } else {
@@ -211,6 +215,10 @@ export default {
         }
       }
     },
+    hidePullUpText () {
+      this.isEmpty = false
+      this.isShowAll = false
+    },
     showPullDownText (key) {
       this.isEnterThreshold = false
       this.isLeaveThreshold = false

src/pages/details/meetingDetail/index.vue

@@ -209,76 +209,7 @@ export default {
       })
     },
     openFileInPdf (attId, fileName) {
-      // 判断是否是图片格式，图片格式不预览，直接下载
+      this.$preview(attId)
-      let index1 = fileName.lastIndexOf('.')
-      let index2 = fileName.length
-      let fileSuffix = fileName.substring(index1, index2)
-      //把后缀转大写
-      if(fileSuffix !== undefined && fileSuffix !== null){
-        fileSuffix = fileSuffix.toUpperCase()
-      }
-      // 判断上传文件格式
-      if (fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG') {
-        this.downloadFile(attId)
-        return true
-      }
-      // 缺少文件
-      if (this.$hasPermission('fd83032ae5f41a0021b00e93c88edbbg')) {
-        if (fileSuffix === '.PDG' || fileSuffix === '.pdg') {
-          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)
-                  }
-                }
-              }).catch(e => {
-            this.$message.warning('文件不存在,预览失败')
-          })
-        }else {
-          this.$http.get('att/attFile/getBusStandFileByAttId', {
-            attId: attId
-          }, {
-            _this: this
-          }, res => {
-            if (res.data) {
-              let fileObj = {}
-              fileObj.fileId = res.data.attId
-              fileObj.fileName = fileName
-              let fileList = []
-              let repeatData = 0
-              if (sessionStorage.getItem('fileInfo')) {
-                fileList = JSON.parse(sessionStorage.getItem('fileInfo'))
-                if (fileList != null && fileList.length > 0) {
-                  for (let i = 0; i < fileList.length; i++) {
-                    if (fileList[i].fileId === res.data.attId) {
-                      repeatData = 1
-                      break
-                    }
-                  }
-                  if (repeatData === 0) {
-                    fileList.push(fileObj)
-                    fileList = JSON.stringify(fileList)
-                    sessionStorage.setItem('fileInfo', fileList)
-                  }
-                }
-              } else {
-                fileList.push(fileObj)
-                fileList = JSON.stringify(fileList)
-                sessionStorage.setItem('fileInfo', fileList)
-              }
-              window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + res.data.attId))
-            } else {
-              this.$message.error('文档未转换成功或本地读取不到该文档')
-            }
-          }, e => {
-            this.$message.error('文档未转换成功或本地读取不到该文档')
-          })
-        }
-      } else {
-        this.$message.error('没有在线预览文档权限！')
-      }
     },
   }
 }

src/pages/details/policyTopicsDetail/index.vue

@@ -365,76 +365,7 @@ export default {
       })
     },
     openFileInPdf (attId, fileName) {
-      // 判断是否是图片格式，图片格式不预览，直接下载
+      this.$preview(attId)
-      let index1 = fileName.lastIndexOf('.')
-      let index2 = fileName.length
-      let fileSuffix = fileName.substring(index1, index2)
-      //把后缀转大写
-      if(fileSuffix !== undefined && fileSuffix !== null){
-        fileSuffix = fileSuffix.toUpperCase()
-      }
-      // 判断上传文件格式
-      if (fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG') {
-        this.downloadFile(attId)
-        return true
-      }
-      // 缺少文件
-      if (this.$hasPermission('fd83032ae5f41a0021b00e93c88edbbg')) {
-        if (fileSuffix === '.PDG' || fileSuffix === '.pdg') {
-          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)
-                  }
-                }
-              }).catch(e => {
-            this.$message.warning('文件不存在,预览失败')
-          })
-        }else {
-          this.$http.get('att/attFile/getBusStandFileByAttId', {
-            attId: attId
-          }, {
-            _this: this
-          }, res => {
-            if (res.data) {
-              let fileObj = {}
-              fileObj.fileId = res.data.attId
-              fileObj.fileName = fileName
-              let fileList = []
-              let repeatData = 0
-              if (sessionStorage.getItem('fileInfo')) {
-                fileList = JSON.parse(sessionStorage.getItem('fileInfo'))
-                if (fileList != null && fileList.length > 0) {
-                  for (let i = 0; i < fileList.length; i++) {
-                    if (fileList[i].fileId === res.data.attId) {
-                      repeatData = 1
-                      break
-                    }
-                  }
-                  if (repeatData === 0) {
-                    fileList.push(fileObj)
-                    fileList = JSON.stringify(fileList)
-                    sessionStorage.setItem('fileInfo', fileList)
-                  }
-                }
-              } else {
-                fileList.push(fileObj)
-                fileList = JSON.stringify(fileList)
-                sessionStorage.setItem('fileInfo', fileList)
-              }
-              window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + res.data.attId))
-            } else {
-              this.$message.error('文档未转换成功或本地读取不到该文档')
-            }
-          }, e => {
-            this.$message.error('文档未转换成功或本地读取不到该文档')
-          })
-        }
-      } else {
-        this.$message.error('没有在线预览文档权限！')
-      }
     },
   }
 }

src/pages/details/regulatoryMaterialsDetail/index.vue

@@ -249,76 +249,7 @@ export default {
       })
     },
     openFileInPdf (attId, fileName) {
-      // 判断是否是图片格式，图片格式不预览，直接下载
+      this.$preview(attId)
-      let index1 = fileName.lastIndexOf('.')
-      let index2 = fileName.length
-      let fileSuffix = fileName.substring(index1, index2)
-      //把后缀转大写
-      if(fileSuffix !== undefined && fileSuffix !== null){
-        fileSuffix = fileSuffix.toUpperCase()
-      }
-      // 判断上传文件格式
-      if (fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG') {
-        this.downloadFile(attId)
-        return true
-      }
-      // 缺少文件
-      if (this.$hasPermission('fd83032ae5f41a0021b00e93c88edbbg')) {
-        if (fileSuffix === '.PDG' || fileSuffix === '.pdg') {
-          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)
-                }
-              }
-            }).catch(e => {
-            this.$message.warning('文件不存在,预览失败')
-          })
-        }else {
-          this.$http.get('att/attFile/getBusStandFileByAttId', {
-            attId: attId
-          }, {
-            _this: this
-          }, res => {
-            if (res.data) {
-              let fileObj = {}
-              fileObj.fileId = res.data.attId
-              fileObj.fileName = fileName
-              let fileList = []
-              let repeatData = 0
-              if (sessionStorage.getItem('fileInfo')) {
-                fileList = JSON.parse(sessionStorage.getItem('fileInfo'))
-                if (fileList != null && fileList.length > 0) {
-                  for (let i = 0; i < fileList.length; i++) {
-                    if (fileList[i].fileId === res.data.attId) {
-                      repeatData = 1
-                      break
-                    }
-                  }
-                  if (repeatData === 0) {
-                    fileList.push(fileObj)
-                    fileList = JSON.stringify(fileList)
-                    sessionStorage.setItem('fileInfo', fileList)
-                  }
-                }
-              } else {
-                fileList.push(fileObj)
-                fileList = JSON.stringify(fileList)
-                sessionStorage.setItem('fileInfo', fileList)
-              }
-              window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + res.data.attId))
-            } else {
-              this.$message.error('文档未转换成功或本地读取不到该文档')
-            }
-          }, e => {
-            this.$message.error('文档未转换成功或本地读取不到该文档')
-          })
-        }
-      } else {
-        this.$message.error('没有在线预览文档权限！')
-      }
     },
   }
 }

src/pages/phone/databaseSearch/index.vue

@@ -0,0 +1,241 @@
+<template>
+  <div id="database-search">
+    <div class="search-head">
+      <div class="head-title">
+        <span class="left-title" @click="back"> < </span>
+        <span class="right-title">全库搜索</span>
+      </div>
+      <van-search
+          v-model="searchQuery.selectValue"
+          show-action
+          placeholder="请输入搜索关键词"
+          @search="onSearch"
+      >
+        <template #action>
+          <div @click="onSearch">搜索</div>
+        </template>
+      </van-search>
+    </div>
+
+    <PhoneScroll
+        ref="scroll"
+        height="calc(100vh - 100px)"
+        :data="list"
+        :page="searchQuery.page"
+        :pageSize="searchQuery.pageSize"
+        :total="total"
+        :loading="loading"
+        pullUpLoad
+        pullDownRefresh
+        :getDataHandler="getData">
+      <div style="padding-top: 10px">
+        <div class="card-content" v-for="item in list" :key="item.id" @click="jumpDetails(item) ">
+          <div class="standTitle">
+            <div class="title">
+              <span v-html="item.title"></span>
+            </div>
+          </div>
+
+          <div class="standContent">
+            <div class="standState">标准类别:
+              <span v-if="item.indexType === 'stand'">国内标准</span>
+              <span v-if="item.indexType === 'FOREIGN'">海外标准</span>
+              <span v-if="item.indexType === 'bussstand'">企业标准</span>
+            </div>
+            <div class="standSubTime">发布日期: {{item.issue_time}} </div>
+          </div>
+        </div>
+      </div>
+    </PhoneScroll>
+  </div>
+</template>
+
+<script>
+import PhoneScroll from "@/components/hzwlComponents/phone/PhoneScroll";
+
+export default {
+  name: "index",
+  components: {
+    PhoneScroll
+  },
+  data () {
+    return {
+      searchQuery: {
+        selectIndex: 'fulltextserch',
+        selectValue: '',
+        selectType: 'titleSearch',
+        clientType:2,
+        page: 1,
+        pageSize: 20
+      },
+      total: 0,
+      list: [],
+      loading: false,
+      url: {
+        searchSarBykey: 'search/searchCenter/searchSarBykey'
+      }
+    }
+  },
+  created() {
+    // this.searchQuery.selectValue = this.$route.query.searchKey
+    // this.getData()
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      if (from.name === 'phoneHome') {
+        vm.searchQuery.selectValue = vm.$route.query.searchKey
+        vm.onSearch()
+      }
+    })
+  },
+  methods: {
+    onSearch () {
+      this.list = []
+      this.getData(1)
+    },
+    getData (page) {
+      return new Promise((resolve, reject) => {
+        const config = {
+          _this: this,
+          loading: 'loading'
+        }
+        if (page) {
+          this.searchQuery.page = page
+        }
+        this.$http._postData(this.url.searchSarBykey, this.searchQuery, config).then(res => {
+          if (res.ok) {
+            this.total = res.data.count
+            if (this.searchQuery.page === 1) {
+              this.list = res.data.list
+            } else {
+              this.list = [...this.list, ...res.data.list]
+            }
+          }
+        }).finally(() => {
+          resolve()
+        })
+      })
+    },
+    back(){
+      this.$router.push('/phoneHome')
+    },
+    jumpDetails(item){
+      if(item.indexType === 'stand' ){
+        this.$router.push({
+          name: 'domesticDetails',
+          query: {
+            id: item.id,
+            pageType: 'INLAND_STAND'
+          }
+        })
+      }else if(item.indexType === 'FOREIGN'){
+        this.$router.push({
+          name: 'domesticDetails',
+          query: {
+            id: item.id,
+            pageType: 'FOREIGN_STAND'
+          }
+        })
+      } else if (item.indexType === 'bussstand') {
+        this.$router.push({
+          name: 'domesticDetails',
+          query: {
+            id: item.id,
+            pageType: 'BUSS'
+          }
+        })
+      }
+    },
+  }
+}
+</script>
+
+<style scoped lang="less">
+#database-search {
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  padding: 0;
+  background: #F6F6F6;
+
+  .search-head {
+    width: 100%;
+    height: 100px;
+    background: #3170A8;
+  }
+
+  .head-title {
+    color: #FFFFFF;
+    line-height: 40px;
+    font-size: 18px;
+
+    .left-title {
+      margin-left: 10px;
+    }
+
+    .right-title {
+      float: right;
+      margin-right: 40%;
+    }
+  }
+
+  .van-search {
+    background: #3170A8;
+    padding: 10px 12px 0 12px;
+  }
+
+  .van-search__content {
+    background: #8DB2D0;
+  }
+
+  .van-search__action {
+    color: #FFFFFF;
+  }
+
+  .card-content {
+    width: 95%;
+    height: auto;
+    margin: 10px;
+    background-color: #FFFFFF;
+    border-radius: 5px;
+    box-shadow: 1px 1px 10px rgba(0, 0, 0, 0.1);
+
+    .standTitle {
+      .title {
+        font-size: 3.4vw;
+        color: #333333;
+        font-weight: 600;
+        height: auto;
+        line-height: 20px;
+        padding: 5px 10px;
+        text-align: left;
+        border-bottom: 1px solid #cccccc;
+      }
+    }
+
+    .standContent {
+      font-size: 3.4vw;
+      color: #555555;
+      font-weight: 450;
+      margin-top: 5px;
+
+      .standState {
+        padding-left: 10px;
+        height: 35px;
+        line-height: 35px;
+      }
+
+      .standSubTime {
+        font-size: 3.4vw;
+        padding-left: 10px;
+        height: 35px;
+        line-height: 35px;
+      }
+    }
+  }
+
+  .card-content:first-child{
+    margin-top: 0;
+  }
+}
+</style>

src/pages/phone/domesticStand/index.vue

@@ -183,10 +183,10 @@ export default {
   methods: {
     onSearch () {
       this.list = []
-      this.searchQuery.page = 1
+      // this.searchQuery.page = 1
-      // 返回顶部
+      // // 返回顶部
-      this.$refs.scroll.scrollTo(0, 0)
+      // this.$refs.scroll.scrollTo(0, 0)
-      this.getData()
+      this.getData(1)
     },
     getData (page) {
       switch (this.$route.query.standType) {

src/pages/phone/standDynamics/components/DataCenter.vue

@@ -67,8 +67,8 @@ export default {
     setChecked (currentData) {
       this.currentSearch = currentData
       this.searchQuery.treeId = currentData.id || ''
-      this.searchQuery.page = 1
+      this.list = []
-      this.getData()
+      this.getData(1)
     },
     getData (page) {
       return new Promise((resolve, reject) => {

src/pages/phone/standDynamics/components/folderPopup.vue

@@ -4,7 +4,8 @@
              :style="{ height: '100%', width: '90%' }"
              round
              :close-on-click-overlay="false"
-             @click-overlay="handleCancel">
+             @click-overlay="handleCancel"
+             get-container="body">
     <h3 class="popup-title">
       <span>体系结构</span>
       <van-icon name="cross" size="22px" @click="handleCancel" />

src/pages/phone/standDynamics/components/folderTree.vue

@@ -18,6 +18,7 @@
           <span style="font-size:18px"> {{ node.label }} </span>
         </span>
       </el-tree>
+      <loading :loading="loading">加载中...</loading>
     </div>
 </template>
 
@@ -31,7 +32,8 @@ export default {
         label: 'name',
         children: 'children'
       },
-      currentKey: ''
+      currentKey: '',
+      loading: false
     }
   },
   created () {
@@ -39,10 +41,13 @@ export default {
   },
   methods: {
     getTreeData () {
+      this.loading = true
       this.$http._getData('fileMaterialCenter/zlTree').then(res => {
         if (res.ok && res.data) {
           this.treeList = res.data
         }
+      }).finally(() => {
+        this.loading = false
       })
     },
     filterNode (value, data) {

src/pages/processCenter/pages/creatProcess/policyWarehousing/step2.vue

@@ -162,7 +162,7 @@ export default {
         {validator: this.verify.valiateEnName, trigger: 'change'}
       ],
       lawsNo: [
-        {required: true, type: 'string', message: '政策文号不能为空', trigger: 'change'},
+        // {required: true, type: 'string', message: '政策文号不能为空', trigger: 'change'},
         {type: 'string', max: 100, message: '政策文号不能超过100个字符', trigger: 'change'}
       ],
       issueTime: [

src/pages/processCenter/pages/creatProcess/qbfz/step7.vue

@@ -418,6 +418,7 @@ export default {
           this.qbfsForm.dataList = this.dataList;
           let json = JSON.stringify(this.qbfsForm);
           let params = {
+            prcNum: this.$route.query.prcNum,
             type: this.qbfsForm.nextStatus,
             id: this.qbfsForm.standId,
           }

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue

@@ -579,16 +579,17 @@ export default {
         if (res.success) {
           this.addLog(this.qbfsForm)
           this.$message.success(res.message)
-          if(this.type === '4'){
+          // 重复发送代办
-            this.batchToDoTasks(data.ids).then((result)=>{
+          // if(this.type === '4'){
-              if(result.ok){
+          //   this.batchToDoTasks(data.ids).then((result)=>{
-                console.log(result)
+          //     if(result.ok){
-                this.$router.push('/processCenter')
+          //       console.log(result)
-              }
+          //       this.$router.push('/processCenter')
-            })
+          //     }
-          }else{
+          //   })
+          // }else{
             this.$router.push('/processCenter')
-          }
+          // }
         }
         this.isSubmit = false
         this.saveLoading = false

src/router/index.js

@@ -96,12 +96,22 @@ const routes = [
     component: () =>
       import('@/pages/phone/phoneHome')
   },
+    /*
   {
     path: '/databaseSearch',
     name: 'databaseSearch',
     component: () =>
       import('@/pages/phone/databaseSearch')
   },
+  */
+  {
+    path: '/databaseSearch',
+    name: 'databaseSearch',
+    component: () => import('@/pages/phone/databaseSearch/index'),
+    meta: {
+      keepAlive: true
+    }
+  },
   {
     path: '/standDynamics',
     name: 'standDynamics',