Merge branch 'dev_2nd_LCYH' of http://git.hzwlsoft.com/laws-nio/laws-weilai into dev_2nd_LCYH

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

@@ -1742,4 +1742,5 @@ module.exports = {
   uploadedfilelarger:'The uploaded file is larger than 50 MB',
   marketCertificationList:'Market Certification List',
   uploadedfilelarger:'The uploaded file is larger than',
+  marketCertificationListDetails:'Market Certification List Details',
 }

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

@@ -1844,4 +1844,5 @@ module.exports = {
   uploadedfilelarger:'文件大于',
   uploadedfilelarger:'文件大于50M',
   marketCertificationList:'市场认证清单',
+  marketCertificationListDetails:'市场认证清单详情',
 }

jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue

@@ -53,15 +53,16 @@
       </span>
     </a-table>
     <div>
-      <a-button type="primary" @click="clickButtonToUpload(fileList)">
-        {{ (fileList === 'null' || fileList === '' ||
-        fileList == null) ? $t('uploadattachment') : $t('viewUploadedFiles')
-        }}
-      </a-button>
-      <div style='margin-top: 20px'>
-        <p>{{$t('note')}}</p>
-        <p>&nbsp;&nbsp;&nbsp;&nbsp;{{$t('format')}}</p>
-      </div>
+<!--      上传附件-->
+<!--      <a-button type="primary" @click="clickButtonToUpload(fileList)">-->
+<!--        {{ (fileList === 'null' || fileList === '' ||-->
+<!--        fileList == null) ? $t('uploadattachment') : $t('viewUploadedFiles')-->
+<!--        }}-->
+<!--      </a-button>-->
+<!--      <div style='margin-top: 20px'>-->
+<!--        <p>{{$t('note')}}</p>-->
+<!--        <p>&nbsp;&nbsp;&nbsp;&nbsp;{{$t('format')}}</p>-->
+<!--      </div>-->
     </div>
     <div class="bootom-button">
       <a-button style="margin-right:50px" @click="save">{{$t('preservation')}}</a-button>

jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue

@@ -685,7 +685,22 @@
             Action(url, query).then((res) => {
               if (res.success) {
                 this.confirmLoading = false
-                this.$message.success(this.$t('OperationSuccessful'))
+                if (res.result && res.result.length > 0) {
+                  let detailedWarningList = []
+                  res.result.forEach(val => {
+                    detailedWarningList.push(
+                    < div > { val } < /div>)
+                  })
+                  this.$warning({
+                    content: (
+                      < div >
+                      { detailedWarningList }
+                      < /div>
+                  )
+                })
+                } else {
+                  this.$message.success(this.$t('OperationSuccessful'))
+                }
                 this.visible = false
                 this.$emit('addModelForm')
               } else {

jero-web/src/views/projectManagement/dialog/parametercolumn.vue

@@ -61,7 +61,7 @@
       :pagination='false'
       :loading='loading'
       :scroll='{x: 600,y:400}'
-      :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
+      :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,columnTitle:" "}'
       @change='handleTableChange'>
       <span slot="configDescription" slot-scope="text,record">
         <a-select class="box-input" v-model="record.configure"

jero-web/src/views/virtualAuthenticationList/virtualAuthenticationListDesign/certificationListMaintenance.vue

@@ -354,7 +354,7 @@
     },
     created() {
       if (this.$route.query.title == '市场认证清单详情') {
-        document.title = this.$t('virtualAuthenticationListDetails')
+        document.title = this.$t('marketCertificationListDetails')
         this.columns.splice(7, 1)
       } else {
         document.title = this.$t('certificationListMaintenance')
@@ -393,7 +393,7 @@
       },
       //模板下载
       handleModule() {
-        downloadFile(this.url.exportTemplate, this.$t('VirtualAuthenticationList') + this.$t('importTemplate') + '.xls', {})
+        downloadFile(this.url.exportTemplate, this.$t('certificationList') + this.$t('importTemplate') + '.xls', {})
       },
       //调取
       transferClick() {
@@ -411,7 +411,7 @@
           ids: selectedRowKeys.join(','),
           authDummyInventoryBaseId: this.$route.query.id
         }
-        downloadFile(this.url.exportData, this.$route.query.name + this.$t('VirtualAuthenticationList') + '.zip', query, this.Deselect)
+        downloadFile(this.url.exportData, this.$route.query.name + this.$t('certificationList') + '.zip', query, this.Deselect)
       },
       Deselect() {
         this.selectedRowKeys = []