修改禅道已知bug

jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue

@@ -24,33 +24,69 @@
         :data-source="dataSource"
         :columns="columns"
       >
+        <span slot="accessoryFile" slot-scope="text,record">
+            <a @click="seeFileClick(text)" v-if="text">
+              {{$t('viewFile')}}
+            </a>
+            <span v-else>--</span>
+        </span>
       </a-table>
+      <div class="page" v-if="dataSource && dataSource.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSize"
+          :total="total"
+          :current="pageNo"
+          @change="pageOnChange"
+          @showSizeChange="SizeChange"
+        />
+      </div>
       <div>
-        <span>对外意见归档:</span>
+        <span class="text">对外意见归档:</span>
+        <div @click="clickButtonToUpload('opinionArchiveId')"
+             v-if="formInline.createBy == this.userInfoQuery.username" class="operator-text">
+          <a-icon type="cloud-upload" />
+          {{$t('clickUpload')}}
+        </div>
+        <div @click="seeFileClick(formInline.opinionArchiveId)" class="operator-text">
+          <a-icon type="eye" />
+          {{$t('viewFile')}}
+        </div>
       </div>
       <div class="drawer-bootom-button">
         <a-button @click="handleCancel">{{$t('cancel')}}</a-button>
       </div>
     </a-drawer>
-    <uploadFile ref="uploadFile" :isMultiple="true" @uploadSuccess="uploadSuccess"></uploadFile>
+    <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"></uploadFile>
+    <viewFileModel ref="viewFileModelRef"/>
   </div>
 </template>
 
 <script>
   import uploadFile from '@/components/uploadFile/file'
-  import { getAction, postAction, downloadFile } from '@/api/manage'
+  import viewFileModel from '@/components/viewFileModel/index'
+  import { getAction, putAction, downloadFile } from '@/api/manage'
+  import { mapGetters } from 'vuex'
 
   export default {
     name: 'evaluationResultsList',
     components: {
-      uploadFile
+      uploadFile,
+      viewFileModel
     },
     data() {
       return {
         confirmLoading: false,
         visible: false,
         loading: false,
+        total: 0,
+        pageSize: 10,
+        pageNo: 1,
         dataSource: [],
+        formInline: {},
+        userInfoQuery:{},
         columns: [
           {
             title: this.$t('relevantSections'),
@@ -77,7 +113,8 @@
             align: 'center',
             width: 180,
             ellipsis: true,
-            dataIndex: 'accessoryFile'
+            dataIndex: 'accessoryFile',
+            scopedSlots: { customRender: 'accessoryFile' }
           },
           {
             title: this.$t('Assessor'),
@@ -97,9 +134,10 @@
       }
     },
     mounted() {
-
+         this.userInfoQuery = this.userInfo()
     },
     methods: {
+      ...mapGetters(['userInfo']),
       clickButtonToUpload(item) {
         this.$refs.uploadFile.perentHandleFunc()
         this.$refs.uploadFile.visible = true
@@ -123,19 +161,67 @@
         /** 赋值给当前对应的表单文件 */
         this.formInline[this.uploadName] = attIdList.join(',')
         this.formInline = { ...this.formInline }
+        this.edit()
+      },
+      edit() {
+        let query = {
+          id: this.lawsOpinionGatherId,
+          opinionArchiveId: this.formInline.opinionArchiveId
+        }
+        putAction('/lawsOpinionGather/lawsOpinionGatherEO/edit', query).then((res) => {
+          if (res.success) {
+
+          }
+        })
       },
       //导出
       handleExport() {
         let query = {
-          dummyInventoryBaseId: this.$route.query.id
+          lawsOpinionGatherId: this.lawsOpinionGatherId,
+          actiProcInstId: this.actiProcInstId
         }
-        downloadFile(this.url.exportData, this.$route.query.name + this.$t('VirtualList') + '.zip', query, this.Deselect)
+        downloadFile('/lawsOpinionGather/lawsOpinionAssessmentResultEO/exportXls',
+          this.$t('evaluationResults') + '.xls', query)
       },
       getData(row) {
         this.visible = true
+        this.formInline = JSON.parse(JSON.stringify(row))
+        this.actiProcInstId = row.actiProcInstId
+        this.lawsOpinionGatherId = row.id
+        console.log(row)
+        this.getList()
       },
       handleCancel() {
         this.visible = false
+      },
+      pageOnChange(page) {
+        this.pageNo = page
+        this.getList()
+      },
+      SizeChange(pageSize) {
+        this.pageNo = 1
+        this.pageSize = pageSize
+        this.getList()
+      },
+      getList() {
+        let query = {
+          lawsOpinionGatherId: this.lawsOpinionGatherId,
+          actiProcInstId: this.actiProcInstId
+        }
+        this.loading = true
+        getAction('/lawsOpinionGather/lawsOpinionAssessmentResultEO/page', query).then((res) => {
+          if (res.success) {
+            this.dataSource = res.result.records || []
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+            this.dataSource = []
+          }
+        })
+      },
+      seeFileClick(item) {
+        this.$refs.viewFileModelRef.clickButtonToUpload(item)
       }
     }
   }
@@ -160,4 +246,16 @@
     text-align: right;
     margin-bottom: 16px;
   }
+
+  .page {
+    text-align: right;
+    margin-top: 20px;
+  }
+
+  .text {
+    font-size: 14px;
+    font-weight: 400;
+    color: #040B29;
+    margin-right: 4px;
+  }
 </style>

jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue

@@ -22,12 +22,21 @@
             </div>
           </a-col>
           <a-col :md="6" :sm="8">
-            <div class="box-title-text">
+            <div class="box-title-text tree-select">
               <div class="title-text" :title="$t('technicalField')">
                 <span>{{$t('technicalField')}}</span>
               </div>
-              <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('technicalField')"
+              <a-tree-select
-                       v-model="queryParam.technologyTerritory"></j-input>
+                tree-node-filter-prop="title"
+                v-model="queryParam.technologyTerritory"
+                :maxTagCount="1"
+                :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                class="box-input"
+                style="width: 100%"
+                :tree-data="CategoryTreeList"
+                tree-checkable
+                :placeholder="$t('PleaseSelect')+$t('technicalField')"
+              />
             </div>
           </a-col>
           <template v-if="toggleSearchStatus">
@@ -36,8 +45,19 @@
                 <div class="title-text" :title="$t('collectResults')">
                   <span>{{$t('collectResults')}}</span>
                 </div>
-                <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('collectResults')"
+                <a-select :placeholder="$t('PleaseSelect')+$t('collectResults')"
-                         v-model="queryParam.gatherResult"></j-input>
+                          class="box-input"
+                          :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                          allowClear
+                          v-model="queryParam.gatherResult">
+                  <a-select-option v-for="(item, key) in gatherResultList"
+                                   :key="key"
+                                   :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.name">
+                           {{ item.name }}
+                     </span>
+                  </a-select-option>
+                </a-select>
               </div>
             </a-col>
           </template>
@@ -108,17 +128,28 @@
       return {
         //url传参严格按照当前命名
         url: {
-          deleteBatch: '',
+          list: '/lawsOpinionGather/lawsOpinionGatherEO/page',
-          list: '/lawsOpinionGather/lawsOpinionGatherEO/page'
+          getSysCategoryTree: '/sys/category/getSysCategoryTree',
         },
         loading: false,
         toggleSearchStatus: false,
-        dataSource: [{}],
+        dataSource: [],
         selectedRowKeys: [],
         total: 0,
         pageSize: 10,
         pageNo: 1,
+        CategoryTreeList:[],
         queryParam: {},
+        gatherResultList:[
+          {
+            value:'Underway',
+            name:this.$t('inProgress'),
+          },
+          {
+            value:'Completed',
+            name:this.$t('Finished'),
+          }
+        ],
         columns: [
           {
             title: this.$t('standard'),
@@ -137,7 +168,7 @@
             align: 'center',
             width: 170,
             ellipsis: true,
-            dataIndex: 'technologyTerritoryShow'
+            dataIndex: 'technologyTerritory'
           },
           {
             title: this.$t('collectResults'),
@@ -172,8 +203,18 @@
     },
     mounted() {
       this.getList()
+      this.getSysCategoryTree()
     },
     methods: {
+      getSysCategoryTree() {
+        getAction(this.url.getSysCategoryTree, {}).then((res) => {
+          if (res.success) {
+            this.CategoryTreeList = res.result
+          } else {
+            this.CategoryTreeList = []
+          }
+        })
+      },
       handleToggleSearch() {
         this.toggleSearchStatus = !this.toggleSearchStatus
       },
@@ -196,10 +237,16 @@
         this.getList()
       },
       getList() {
+        let queryParam = JSON.parse(JSON.stringify(this.queryParam))
+        Object.keys(queryParam).forEach(val => {
+          if (queryParam[val] instanceof Array) {
+            queryParam[val] = queryParam[val].join(',')
+          }
+        })
         let query = {
           pageNo: this.pageNo,
           pageSize: this.pageSize,
-          ...this.queryParam
+          ...queryParam
         }
         this.loading = true
         getAction(this.url.list, query).then((res) => {
@@ -241,6 +288,11 @@
     }
   }
 </script>
+<style>
+  .tree-select .ant-select-tree-dropdown{
+     height: 298px!important;
+  }
+</style>
 <style scoped>
   @import '~@assets/less/common.less';
 

jero-web/src/views/processCenter/processForm/processDetails/index.vue

@@ -49,15 +49,6 @@
       // 请求转换流程图
       processNum() {
         let params = {}
-        if (this.$route.query.prcType == 5){
-          params = {
-            prcId: this.$route.query.prcId
-          }
-        }else{
-          params = {
-            prcNum: this.$route.query.prcNum
-          }
-        }
         axios.request({
           url: '/jero-boot/workFlow/getImg?_t=' + new Date().getTime(),
           responseType: 'blob',
@@ -65,7 +56,9 @@
           headers: {
             'X-Access-Token': Vue.ls.get(ACCESS_TOKEN)
           },
-          params: params
+          params: {
+            prcNum: this.$route.query.prcNum
+          }
         }).then(res => {
           this.processStep = window.URL.createObjectURL(res.data)
         })