合并分支 'fix_bug_first_stage' 到 'master'

Fix bug first stage

查看合并请求 laws-nio/laws-weilai!80

jero-web/src/views/documentTools/virtualList/components/addModel.vue

@@ -1,6 +1,6 @@
 <template>
   <a-drawer
-    title="添加"
+    :title="$t('add')"
     :maskClosable="false"
     :width="1000"
     placement="right"

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

@@ -82,7 +82,7 @@
 </template>
 
 <script>
-  import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
+  import { getAction, postAction, downloadFile, deleteAction,downloadFilePost } from '@/api/manage'
   import store from '@/store/'
 
   export default {
@@ -214,9 +214,9 @@
         let query = {
           ...this.queryParam,
           projectLibraryId: this.$route.query.id,
-          ncrTrackVOList: JSON.stringify(this.content)
+          ncrTrackVOList: this.content
         }
-        downloadFile(this.url.exportData, this.$t('NonConformance') + '.xls', query, this.Deselect)
+        downloadFilePost(this.url.exportData, this.$t('NonConformance') + '.xls', query, this.Deselect)
       },
       getList() {
         let query = {

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

@@ -36,7 +36,7 @@
         :scroll="{x: 1000}"
         :data-source="dataList"
         :pagination="false"
-        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:' ' }"
         :loading="loading">
 
       </a-table>

jero-web/src/views/projectManagement/projectNonConformance/index.vue

@@ -182,7 +182,7 @@
 </template>
 
 <script>
-  import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
+  import { getAction, postAction, downloadFile, deleteAction ,downloadFilePost} from '@/api/manage'
   import PersonnelSelection from '@/components/PersonnelSelection/index'
   import store from '@/store/'
 
@@ -354,9 +354,9 @@
       handleExport() {
         let query = {
           ...this.queryParam,
-          ncrTrackVOList: JSON.stringify(this.content)
+          ncrTrackVOList: this.content
         }
-        downloadFile(this.url.exportData, this.$t('NonConformance') + '.xls', query, this.Deselect)
+        downloadFilePost(this.url.exportData, this.$t('NonConformance') + '.xls', query, this.Deselect)
       },
       Deselect() {
         this.selectedRowKeys = []