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

jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue

@@ -21,7 +21,7 @@
                          v-model="queryParam.serial_number"></a-input>
               </div>
             </a-col>
-            <template v-if="toggleSearchStatus">
+<!--            <template v-if="toggleSearchStatus">-->
             <a-col :md="12" :sm="8">
               <div class="box-title-text">
                 <div class="title-text" :title="$t('title')">
@@ -42,13 +42,13 @@
 <!--                                   :triggerChange="false" :dictCode="'state'"/>-->
 <!--              </div>-->
 <!--            </a-col>-->
-            </template>
+<!--            </template>-->
             <span style="float: right;overflow: hidden;" class="table-page-search-submitButtons">
                <a-col :md="12" :sm="24">
-                  <a @click="handleToggleSearch">
-                          {{ !toggleSearchStatus ? $t('open') : $t('away') }}
-                           <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-                  </a>
+<!--                  <a @click="handleToggleSearch">-->
+<!--                          {{ !toggleSearchStatus ? $t('open') : $t('away') }}-->
+<!--                           <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
+<!--                  </a>-->
                   <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
                   <a-button class="box-button" style="margin-left: 8px" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
                   <globalAdvancedQuery ref="globalAdvancedQueryRef"

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

@@ -385,7 +385,7 @@
             ellipsis: true,
             dataIndex: 'fileName',
             scopedSlots: { customRender: 'fileName' },
-            width: 200
+            width: 400
           },
           {
             title: this.$t('fileDeclaration'),
@@ -393,7 +393,7 @@
             ellipsis: true,
             dataIndex: 'fileDescription',
             scopedSlots: { customRender: 'projectName' },
-            width: 300
+            width: 400
           },
           {
             title: this.$t('uploadedBy'),
@@ -412,14 +412,14 @@
             align: 'left',
             ellipsis: true,
             dataIndex: 'createTime',
-            width: 250
+            width: 150
           },
           {
             title: this.$t('operation'),
             align: 'left',
             fixed: 'right',
             ellipsis: true,
-            width: 250,
+            width: 150,
             scopedSlots: { customRender: 'operation' }
           }
         ],

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

@@ -329,6 +329,13 @@
               trigger: 'blur'
             }
           ],
+          projectVersion:[
+            {
+              required: true,
+              message: this.$t('projectVersion') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            }
+          ],
           digitalPlatform: [
             {
               max: 100,

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

@@ -21,6 +21,7 @@
                 <a-form-model-item class="itemModel" :prop="this.formInline.id?'':'serialNumber'">
                   <a-select :placeholder="$t('PleaseSelect')+$t('regulationNo')"
                             optionFilterProp="label"
+                            v-if="!this.formInline.id"
                             @change="serialNumberChange"
                             :disabled="this.formInline.id?true:false"
                             showSearch
@@ -35,6 +36,11 @@
                      </span>
                     </a-select-option>
                   </a-select>
+                  <a-input class="box-input"
+                           :disabled="true"
+                           v-else
+                           v-model.trim="formInline.serialNumber"
+                           :placeholder="$t('PleaseEnter')+this.$t('regulationNo')"/>
                 </a-form-model-item>
               </div>
             </a-col>

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

@@ -513,6 +513,7 @@ export default {
       window.open(newUrl.href, '_blank')
     },
     projectInfoClick(item){
+      item.projectName = item.showName
       let newUrl = this.$router.resolve({
         path: '/ProjectDetails',
         query: item