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

jero-web/src/common/lang/en-us.js

@@ -1257,4 +1257,6 @@ module.exports = {
   forward:'Forward',
   issuedBy:'Issued by',
   pleaseDecompositionStandardOrder:'Please import or bring in at least one decomposition standard order',
+  currentlyTheFirstOneThatCannotMovedUp:'Currently the first one that cannot be moved up',
+  currentlyTheLastOneCannotmovedDown:'Currently the last one cannot be moved down',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1359,4 +1359,6 @@ module.exports = {
   forward:'转发',
   issuedBy:'发布人',
   pleaseDecompositionStandardOrder:'请导入或带入至少一条分解标准单',
+  currentlyTheFirstOneThatCannotMovedUp:'当前已是第一个无法进行上移',
+  currentlyTheLastOneCannotmovedDown:'当前已是最后一个无法进行下移',
 }

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

@@ -255,6 +255,7 @@
           pageNo: this.pageNo,
           pageSize: this.pageSize,
           serialNumber: this.$route.query.serialNumber ? this.$route.query.serialNumber : '',
+          gatherResult: this.$route.query.gatherResult ? this.$route.query.gatherResult : '',
           ...queryParam
         }
         this.loading = true

jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue

@@ -163,7 +163,11 @@
             this.sortList.push(this.dataSource[index - 1])
           }
         }
+        if (this.sortList.length > 1) {
           this.move()
+        } else {
+          this.$message.warning(this.$t('currentlyTheFirstOneThatCannotMovedUp'))
+        }
       },
       moveDownClick(row, index) {
         this.sortList = []
@@ -180,7 +184,11 @@
             this.sortList.push(this.dataSource[index + 1])
           }
         }
+        if (this.sortList.length > 1) {
           this.move()
+        } else {
+          this.$message.warning(this.$t('currentlyTheLastOneCannotmovedDown'))
+        }
       },
       move() {
         postAction('/report/lawsMonthlyReportTitleTemplateEO/move', { lawsMonthlyReportTitleTemplateEOS: this.sortList }).then((res) => {

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

@@ -324,6 +324,7 @@
           pageNo: this.pageNo,
           pageSize: this.pageSize,
           serialNumber: this.$route.query.serialNumber ? this.$route.query.serialNumber : '',
+          flowStatus: this.$route.query.flowStatus ? this.$route.query.flowStatus : '',
           ...queryParam
         }
         this.loading = true

jero-web/src/views/dashboard/components/myList.vue

@@ -88,6 +88,7 @@
       prcClick(row) {
         // let index = row.taskIds.lastIndexOf(',')
         // row.taskIds = row.taskIds.slice(0, index)
+        row.router = this.$route.path
         if (row.prcType == '1') {
           let newUrl = this.$router.resolve({
             path: '/handshakeProcess',

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

@@ -327,7 +327,7 @@
             this.$message.success(this.$t('OperationSuccessful'))
             this.loading = false
             this.$router.push({
-              path: '/technologyAssessment'
+              path: this.$route.query.router
             })
           } else {
             this.loading = false

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

@@ -192,7 +192,7 @@
             this.$message.success(this.$t('OperationSuccessful'))
             this.loading = false
             this.$router.push({
-              path: '/collectionOfRegulatoryOpinions'
+              path: this.$route.query.router
             })
           } else {
             this.loading = false

jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue

@@ -154,6 +154,7 @@
       dealWith(row) {
         // let index = row.taskIds.lastIndexOf(',')
         // row.taskIds = row.taskIds.slice(0, index)
+        row.router = this.$route.path
         if (row.prcType == '1') {
           let newUrl = this.$router.resolve({
             path: '/handshakeProcess',

jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue

@@ -675,7 +675,9 @@
           this.handlePreservation()
         }
       }, 10000)
-      this.paramsManifest = JSON.parse(localStorage.getItem('paramsManifest'))
+      // this.paramsManifest = JSON.parse(localStorage.getItem('paramsManifest'))
+      this.paramsManifest = this.$route.query
+      // document.title = `${this.paramsManifest.title}-` + this.$t('ParameteItemCollectionList')
       document.title = `${this.paramsManifest.title}-` + this.$t('ParameteItemCollectionList')
     },
     methods: {

jero-web/src/views/projectManagement/components/TaskParameterCollection.vue

@@ -252,12 +252,11 @@
         // 先调取接口判断是否有配置信息
         getAction(this.url.verifyConfig, { paramsManifestId: item.id }).then((res) => {
           if (res.result) {
-            localStorage.setItem('paramsManifest', JSON.stringify(item))
+            // localStorage.setItem('paramsManifest', JSON.stringify(item))
             let newUrl = _this.$router.resolve({
               path: '/ParameterItemCollection',
               query:  item
                 // projectName:this.$route.query.projectName
-
             })
             window.open(newUrl.href, '_blank')
           } else {

jero-web/src/views/regulationsKanban/components/addModel.vue

@@ -211,7 +211,8 @@ export default {
       this.$router.push({
         path: '/collectionOfRegulatoryOpinions',
         query:{
-          serialNumber:this.item.serialNumber
+          serialNumber:this.item.serialNumber,
+          gatherResult:'Completed'
         }
       })
     },
@@ -228,7 +229,8 @@ export default {
       this.$router.push({
         path: '/technologyAssessment',
         query:{
-          serialNumber:this.item.serialNumber
+          serialNumber:this.item.serialNumber,
+          flowStatus:'Completed'
         }
       })
     },
@@ -257,7 +259,7 @@ export default {
         id:this.paramsManifestId,
         ...this.formData
       }
-      downloadFile('/project/lawsComplianceBoard/exportComplianceResultDetail', this.$t('complianceResults')+'.xls', query, this.Deselect)
+      downloadFile('/project/lawsComplianceBoard/exportComplianceResultDetail', this.item.serialNumber  +'.xls', query, this.Deselect)
     },
     searchQuery() {
       this.loadData()

jero-web/src/views/regulationsKanban/index.vue

@@ -72,22 +72,29 @@
       </div>
     </div>
     <div>
+<!--      calc(100vh - 130px)-->
       <a-table
-        ref="table"
+        class="table"
-        size="middle"
-        :loading="loading"
-        :pagination="false"
-        :scroll="{x: '100%',y:'calc(100vh - 130px)'}"
         rowKey="id"
-        :data-source="dataSource"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :pagination="false"
+        :scroll="{x: '100%',y:'calc(100vh - 155px)'}"
+        :data-source="dataSource"
+        :loading="loading"
         :columns="columns"
+        @change="tableOnChange"
       >
         <span slot="technicalField" slot-scope="text,record" :title="text">
           <a @click="entryNameClick(record)">
             {{ text && text.length > 23 ? text.slice(0, 22) + '...' : text }}
           </a>
         </span>
+        <span slot="standard" slot-scope="text,record" :title="text">
+            {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }}
+        </span>
+<!--        <span slot="serialNumber" slot-scope="text,record" :title="text">-->
+<!--            {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }}-->
+<!--        </span>-->
         <span slot="operation" slot-scope="text,record">
             <a class="text-operation" @click="handlecody(record)">{{$t('ViewConformanceResults')}}</a>
         </span>
@@ -161,13 +168,15 @@ export default {
           title: this.$t('standard'),
           align: 'center',
           dataIndex: 'serialNumber',
-          width: 180
+          width: 180,
+          scopedSlots: { customRender: 'standard' }
         },
         {
           title: this.$t('title'),
           align: 'center',
           dataIndex: 'title',
-          width: 180
+          width: 180,
+          scopedSlots: { customRender: 'standard' }
         },
         {
           title: this.$t('status'),
@@ -256,7 +265,11 @@ export default {
       this.toggleSearchStatus = !this.toggleSearchStatus
     },
     onSelectChange(value) {
+      this.selectedRowKeys = value
       this.selectedRowKeysArray = this.selectedRowKeys.join(',')
+      console.log(this.selectedRowKeysArray)
+    },
+    tableOnChange(val) {
     },
     deriveconformanceresults(){
       let query = {