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

@@ -1719,4 +1719,5 @@ module.exports = {
   note:'Note: The attachment includes the list of test items and test report. Test standard or technical specification',
   format:'It supports doc/docx/pdf format and is less than 50M in size',
   cantTransferToYourself:"Can't transfer to yourself",
+  theDataYouInitiate:'The data you selected does not meet the process initiation criteria. Please recheck and initiate',
 }

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

@@ -1821,4 +1821,5 @@ module.exports = {
   note:'注:附件包括测试项目清单、测试报告．测试标准或技术规范',
   format:'支持doc/docx/pdf格式,大小50M以内',
   cantTransferToYourself:"不能转办给自己",
+  theDataYouInitiate:'您所选的数据，均不符合流程发起条件，请重新检查后发起',
 }

jero-web/src/components/uploadFileOta/file.vue

@@ -34,7 +34,7 @@
 
   export default {
     name: 'file',
-    props: ['disableds', 'disabled', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads', 'Uploadable'],
+    props: ['disableds', 'disabled','acceptcode', 'thisFileUploadUrl', 'readonly', 'thisFileType', 'isUploadFile', 'isMultiple', 'restrictUploads', 'Uploadable'],
     data() {
       return {
         visible: false,
@@ -88,6 +88,16 @@
         // let thisFileType = this.thisFileType.replace(/\s+/g, "");
         console.log(file)
         this.fileTypeSatus = true
+        //根据格式拦截
+        if(this.acceptcode){
+          let fileNames = file.name.split('.')
+          let fileType = fileNames[fileNames.length - 1].toLocaleLowerCase()
+          let extList = this.acceptcode.split(',')
+          if (!extList.find((item) => item == fileType)) {
+            this.$message.error(this.$t('uploadOnly') + this.acceptcode + this.$t('type'))
+            return false
+          }
+        }
         if (this.isMultiple) {
           if ((this.myfileList && this.myfileList.length == 1) || this.myfileList && this.myfileList.length > 1) {
             this.$message.warning(this.$t('onlyOnefileUploaded'))

jero-web/src/views/otamanagement/vehicleinformation/components/beupgradedonline.vue

@@ -50,13 +50,13 @@
       </span>
       <!--       技术参数-->
       <span slot="technicalparameters" slot-scope="text,record">
-          <a-input :placeholder="$t('ifNot')" :title="$t('ifNot')" v-model="record.sjggcs" :max-length="500"></a-input>
+          <a-input :placeholder="$t('ifNot')" :title="record.sjggcs ? record.sjggcs : $t('ifNot')" v-model="record.sjggcs" :max-length="500"></a-input>
       </span>
       <span slot="functiondescription" slot-scope="text,record">
-          <a-input :placeholder="$t('pleaseEnter')" :title="$t('ifNot')" v-model="record.gnms" :max-length="500"></a-input>
+          <a-input :placeholder="$t('ifNot')" :title="record.gnms ? record.gnms:$t('ifNot')" v-model="record.gnms" :max-length="500"></a-input>
       </span>
       <span slot="applicationconditions" slot-scope="text,record">
-          <a-input :placeholder="$t('pleaseEnter')" :title="$t('ifNot')" v-model="record.sytj" :max-length="500"></a-input>
+          <a-input :placeholder="$t('ifNot')" :title="record.sytj ? record.sytj:$t('ifNot')" v-model="record.sytj" :max-length="500"></a-input>
       </span>
       <span slot="functiondeelectronicscription" slot-scope="text,record">
           <a-input :placeholder="$t('pleaseEnter')" v-model="record.kzqmc" :max-length="500"></a-input>
@@ -87,14 +87,12 @@
           <a v-if="dataSource.length >1" class="text-operation" @click="deleteData(record)">{{$t('delete')}}</a>
       </span>
     </a-table>
-   
+    <div>
-    <div style="display: inline-block;">
-      <span style="margin-right: 10px;">证明材料:</span>
       <a-button @click="clickButtonToUpload(fileList)" type="primary">  {{ (fileList === 'null' || fileList === '' ||
         fileList == null) ? $t('clickUpload') : $t('viewUploadedFiles')
                         }}</a-button>
 
-      <div style='margin: 20px 0px 0px 70px'>
+      <div style='margin-top: 20px'>
         <p>{{ $t('note') }}</p>
         <p>&nbsp;&nbsp;&nbsp;&nbsp;{{ $t('format') }}</p>
       </div>
@@ -137,7 +135,7 @@ import ImportFile from '@/components/ImportFileData/index'
             gnmc:'车道偏离预警(LDW)',
           },
           {
-            gnmc:'盲区监测(BSD)',
+            gnmc:'百区监测(BSD)',
           },
           {
             gnmc:'驾驶员疲劳监测(DFM)',

jero-web/src/views/otamanagement/vehicleinformation/components/safetyPrecautions.vue

@@ -47,7 +47,7 @@
       <a-button type="primary" style='width: 73px;margin-right: 50px' @click='last'>{{$t('last')}}</a-button>
       <a-button type="primary" style='width: 73px' @click='next'>{{$t('next')}}</a-button>
     </div>
-    <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"></uploadFile>
+    <uploadFile ref="uploadFile" :acceptcode="'doc,docx,pdf'" @uploadSuccess="uploadSuccess"></uploadFile>
   </div>
 </template>
 

jero-web/src/views/otamanagement/vehicleinformation/components/upgradedonline.vue

@@ -32,7 +32,7 @@
       </span>
 <!--       技术参数-->
       <span slot="technicalparameters" slot-scope="text,record">
-          <a-input :placeholder="$t('ifNot')" :title="$t('ifNot')" v-model="record.sjbgcs" :max-length="500"></a-input>
+          <a-input :placeholder="$t('ifNot')" :title="record.sjbgcs ? record.sjbgcs : $t('ifNot')" v-model="record.sjbgcs" :max-length="500"></a-input>
       </span>
 <!--      上传附件-->
       <span slot="architecturetopologydiagram" slot-scope="text,record">
@@ -99,7 +99,7 @@
       <a-button type="primary" style='width: 73px' @click='next'>{{$t('next')}}</a-button>
     </div>
     <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"></uploadFile>
-    <uploadFileOta ref="uploadFileOta" @uploadSuccess="uploadSuccessOta"></uploadFileOta>
+    <uploadFileOta ref="uploadFileOta" :acceptcode="'doc,docx,pdf'" @uploadSuccess="uploadSuccessOta"></uploadFileOta>
   </div>
 </template>
 

jero-web/src/views/otamanagement/vehicleregistration/index.vue

@@ -104,7 +104,7 @@
         {{ $t('datamaintenance') }}
       </div>
       <div v-has="'regulatoryAndTechnicalAssessment:batchDelete'" class="operator-text">
-        <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" />
+        <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" :accept="'.zip'" @getList="getList"/>
       </div>
       <div @click="handleModule" v-has="'regulatoryAndTechnicalAssessment:batchDelete'" class="operator-text">
         <a-icon type="download" />

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

@@ -1528,7 +1528,7 @@
                     _this.selectedRowKeys = []
                     _this.getList()
                     if (detailedWarningList && detailedWarningList.length > 0) {
-                      this.promptInformation(detailedWarningList)
+                      _this.promptInformation(detailedWarningList)
                     }
                   } else {
                     _this.$message.warning(_this.$t('operationFailed'))
@@ -2389,9 +2389,11 @@
             _this.detailedWarningList.push(
             < div > { dataList[i].serialNumber + _this.$t('pleaseSelectTheDataverificationVerified') } < /div>)
           }
+
         }
         if (this.requestsNum == 0) {
-          _this.promptInformation(_this.detailedWarningList)
+          this.$message.warning(_this.$t('theDataYouInitiate'))
+          // _this.promptInformation(_this.detailedWarningList)
           this.JTextLoading = false
         }
       },