合并分支 'dev_third_stage' 到 'master'

Dev third stage

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

jero-web/src/components/globalAdvancedQuery/index.vue

@@ -178,6 +178,7 @@
                   v-model="item.val"
                   :options="item.options"
                   allowClear
+                  class="item-input"
                   :placeholder="$t('pleaseSelect')"
                   :mode="allowMultiple(item)?'multiple':''"
                 />
@@ -191,12 +192,14 @@
                 <a-time-picker v-else-if="item.type==='time'"
                                :value="item.val ? moment(item.val,'HH:mm:ss') : null" format="HH:mm:ss"
                                style="width: 100%;display: inline-block" @change="(time,value)=>item.val=value"/>
-                <a-input-number v-else-if=" item.type=='int'||item.type=='number' " style="width: 100%" :placeholder="$t('pleaseSelect')+$t('numericalValue')" v-model="item.val"/>
+                <a-input-number v-else-if=" item.type=='int'||item.type=='number' "
+                                class="item-input"
+                                style="width: 100%" :placeholder="$t('pleaseSelect')+$t('numericalValue')" v-model="item.val"/>
                 <a-select v-else-if="item.type=='switch'" :placeholder="$t('pleaseSelect')" v-model="item.val">
                   <a-select-option value="Y">{{$t('yes')}}</a-select-option>
                   <a-select-option value="N">{{$t('not')}}</a-select-option>
                 </a-select>
-                <a-input v-else v-model="item.val" :placeholder="$t('EnterValue')"/>
+                <a-input v-else v-model="item.val" class="item-input" :placeholder="$t('EnterValue')"/>
               </a-col>
 
               <a-col :md="4" :xs="0" style="margin-bottom: 12px;">
@@ -748,4 +751,10 @@
   ::v-deep .ant-modal-body{
     overflow-y: visible!important;
   }
+  .item-input{
+     height: 38px;
+  }
+  ::v-deep .ant-select{
+    height: 38px;
+  }
 </style>

jero-web/src/mixins/JeroListMixin.js

@@ -87,6 +87,10 @@ export const JeroListMixin = {
       getAction(this.url.list, params).then((res) => {
         if (res.success) {
           //update-begin---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
+          if (res.result.current > 1 && res.result.records.length == 0) {
+            this.loadData(1)
+            return
+          }
           this.dataSource = res.result.records||res.result;
           if(res.result.total)
           {

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

@@ -261,6 +261,11 @@
         this.loading = true
         getAction(this.url.list, query).then((res) => {
           if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
             this.dataSource = res.result.records || []
             this.total = res.result.total
             this.loading = false

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

@@ -126,6 +126,11 @@
         this.loading = true
         getAction(this.url.getInfoList, query).then((res) => {
           if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
             this.conList = res.result.records
             this.total = res.result.total
             this.loading = false

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

@@ -241,6 +241,11 @@
         this.loading = true
         getAction(this.url.list, query).then((res) => {
           if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
             this.dataSource = res.result.records || []
             this.total = res.result.total
             this.loading = false

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

@@ -336,9 +336,7 @@
         })
       },
       backClick() {
-        this.$router.push({
-          path: '/problemknowledgeBase'
-        })
+        this.$router.go(-1)
       }
       ,
       showPermissionsChange(event, name) {

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

@@ -26,15 +26,15 @@
         </template>
       </div>
       <div class="box-content-right">
-        <div @click="classificationClick" class="operator-text">
+        <div @click="classificationClick" class="operator-text-text-index">
           <a-icon type="setting"/>
           {{$t('classificationMaintenance')}}
         </div>
-        <div @click="managePublishingClick" class="operator-text">
+        <div @click="managePublishingClick" class="operator-text-text-index">
           <a-icon type="carry-out"/>
           {{$t('managePublishing')}}
         </div>
-        <div @click="newlyAddedClick" class="operator-text">
+        <div @click="newlyAddedClick" class="operator-text-text-index">
           <a-icon type="plus"/>
           {{$t('newlyAdded')}}
         </div>
@@ -183,6 +183,11 @@
         this.loading = true
         getAction(this.url.getInfoList, query).then((res) => {
           if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
             this.conList = res.result.records
             if (this.conList && this.conList.length > 0) {
               this.conList.forEach(val => {
@@ -269,7 +274,7 @@
     margin-top: 20px;
   }
 
-  .operator-text {
+  .operator-text-text-index {
     cursor: pointer;
     margin-right: 53px;
     font-size: 14px;
@@ -278,7 +283,7 @@
     display: inline-block;
   }
 
-  .operator-text:last-child {
+  .operator-text-text-index:last-child {
     margin-right: 13px;
   }
 

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

@@ -131,6 +131,11 @@
         this.loading = true
         getAction(this.url.getInfoList, query).then((res) => {
           if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
             this.conList = res.result.records
             if (this.conList && this.conList.length > 0) {
               this.conList.forEach(val => {

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

@@ -3,9 +3,9 @@
     <div class="doc-detail-wrap">
       <div class="doc-detail-header" style="position: fixed;top: 0">
         <div class="doc-detail-title">
-           <span style="line-height: 66px;display: inline-block;float: left">
-             <a-icon type="arrow-left" style="margin-right: 6px;"/>
-           </span>
+<!--           <span style="line-height: 66px;display: inline-block;float: left">-->
+<!--             <a-icon type="arrow-left" @click="back" style="margin-right: 6px;"/>-->
+<!--           </span>-->
           {{queryForm.title}}
         </div>
         <div class="doc-detail-right">

jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue

@@ -206,7 +206,7 @@
         getAction(this.url.list, query).then((res) => {
           if (res.success) {
             if (res.result.current > 1 && res.result.records.length == 0) {
-              this.pageNo = res.result.current - 1
+              this.pageNo = 1
               this.getList()
               return
             }

jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue

@@ -194,7 +194,7 @@
         getAction(this.url.list, query).then((res) => {
           if (res.success) {
             if (res.result.current > 1 && res.result.records.length == 0) {
-              this.pageNo = res.result.current - 1
+              this.pageNo = 1
               this.getList()
               return
             }

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

@@ -331,6 +331,11 @@
         this.loading = true
         getAction(this.url.list, query).then((res) => {
           if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
             this.dataSource = res.result.records || []
             this.total = res.result.total
             this.loading = false

jero-web/src/views/documentManage/collection/index.vue

@@ -164,6 +164,11 @@
         this.loading = true
         postAction(`collection/onlCgformCollection/page`, params).then(res => {
           if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.queryParams.pageNo = 1
+              this.loadData()
+              return
+            }
             this.tableData = [...res.result.records]
             this.total = res.result.total
             this.loading = false

jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue

@@ -1324,6 +1324,18 @@
     border: 1px #00B3BE solid;
     color: #00B3BE;
   }
+
+  ::v-deep .ant-select-tree {
+    width: auto;
+    height: 300px;
+    overflow: auto;
+    position: absolute;
+    /*background: #fff;*/
+  }
+
+  ::v-deep .ant-select-tree-dropdown {
+    min-height: 320px;
+  }
 </style>
 
 <style lang="less">

jero-web/src/views/documentManage/subscribtion/index.vue

@@ -185,6 +185,11 @@
         this.loading = true
         postAction(`subscribe/onlCgformSubscribe/page`, params).then(res => {
           if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.queryParams.pageNo = 1
+              this.loadData()
+              return
+            }
             this.tableData = [...res.result.records]
             this.total = res.result.total
             this.loading = false

jero-web/src/views/documentTools/documentComparison/components/initiateComparison.vue

@@ -71,7 +71,7 @@
                      {{$t('selectedStandard')}}
                 </span>
                 <span class="box-button-standard-right"
-                       :title="selectedRowKeysLeftRecord[0]?selectedRowKeysLeftRecord[0].serialNumber+' '+selectedRowKeysLeftRecord[0].fileName:$t('noComparisonDocumentSelected')"
+                      :title="selectedRowKeysLeftRecord[0]?selectedRowKeysLeftRecord[0].serialNumber+' '+selectedRowKeysLeftRecord[0].fileName:$t('noComparisonDocumentSelected')"
                       :class="{'box-button-standard-right-color':selectedRowKeysLeftRecord[0]}">
                       {{selectedRowKeysLeftRecord[0]?selectedRowKeysLeftRecord[0].serialNumber+' '+selectedRowKeysLeftRecord[0].fileName:$t('noComparisonDocumentSelected')}}
                </span>
@@ -357,6 +357,11 @@
         this.loadingLeft = true
         getAction(this.url.list, query).then((res) => {
           if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNoLeft = 1
+              this.getListLeft()
+              return
+            }
             this.dataSourceLeft = res.result.records || []
             this.totalLeft = res.result.total
             this.loadingLeft = false
@@ -381,6 +386,11 @@
         this.loadingRight = true
         getAction(this.url.list, query).then((res) => {
           if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNoRight = 1
+              this.getListRight()
+              return
+            }
             this.dataSourceRight = res.result.records || []
             this.totalRight = res.result.total
             this.loadingRight = false

jero-web/src/views/documentTools/documentComparison/index.vue

@@ -258,6 +258,11 @@
         this.loading = true
         getAction(this.url.list, query).then((res) => {
           if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
             this.dataSource = res.result.records || []
             this.total = res.result.total
             this.loading = false
@@ -491,11 +496,11 @@
   }
 
   ::v-deep .ant-table-row:first-child {
-    background: #fff!important;
+    background: #fff !important;
     opacity: 0.9;
   }
 
   ::v-deep .ant-table-body {
-    background: transparent!important;
+    background: transparent !important;
   }
 </style>

jero-web/src/views/documentTools/documentTranslation/index.vue

@@ -276,6 +276,11 @@
         this.loading = true
         getAction(this.url.list, query).then((res) => {
           if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
             this.dataSource = res.result.records || []
             this.total = res.result.total
             this.loading = false

jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue

@@ -7,6 +7,7 @@
             <span class="text-sel" :title="$t('problemClassification')">{{$t('problemClassification')}}</span>
             <a-select :placeholder="$t('PleaseSelect')+$t('problemClassification')"
                       class="text-select"
+                      mode="multiple"
                       :getPopupContainer="triggerNode=> triggerNode.parentNode"
                       allowClear
                       v-model="queryParamOne.problem_type">

jero-web/src/views/documentTools/searchCenter/index.vue

@@ -65,10 +65,10 @@
                 <a-tab-pane :key="$t('whole')" :tab="$t('whole')"></a-tab-pane>
                 <a-tab-pane :key="$t('DocumentLibrary')" :tab="$t('DocumentLibrary')" force-render>
                 </a-tab-pane>
-<!--                <a-tab-pane :key="$t('problemKnowledgeBase')" :tab="$t('problemKnowledgeBase')" force-render>-->
-<!--                </a-tab-pane>-->
-<!--                <a-tab-pane :key="$t('monthlyReportRegulations')" :tab="$t('monthlyReportRegulations')" force-render>-->
-<!--                </a-tab-pane>-->
+                <a-tab-pane :key="$t('problemKnowledgeBase')" :tab="$t('problemKnowledgeBase')" force-render>
+                </a-tab-pane>
+                <a-tab-pane :key="$t('monthlyReportRegulations')" :tab="$t('monthlyReportRegulations')" force-render>
+                </a-tab-pane>
               </a-tabs>
             </div>
           </div>

jero-web/src/views/documentTools/virtualList/index.vue

@@ -413,7 +413,7 @@
         getAction(this.url.list, query).then((res) => {
           if (res.success) {
             if (res.result.current > 1 && res.result.records.length == 0) {
-              this.pageNo = res.result.current - 1
+              this.pageNo = 1
               this.getList()
               return
             }

jero-web/src/views/parameter/ParameterTemplate/index.vue

@@ -364,7 +364,7 @@ export default {
       getAction(this.url.list, query).then((res) => {
         if (res.success) {
           if (res.result.current > 1 && res.result.records.length == 0) {
-            this.pageNo = res.result.current - 1
+            this.pageNo = 1
             this.getList()
             return
           }

jero-web/src/views/parameter/escalationlibrary/index.vue

@@ -236,7 +236,7 @@
         getAction(this.url.list, query).then((res) => {
           if (res.success) {
             if (res.result.current > 1 && res.result.records.length == 0) {
-              this.pageNo = res.result.current - 1
+              this.pageNo = 1
               this.getList()
               return
             }

jero-web/src/views/parameter/managementdetails/index.vue

@@ -363,7 +363,7 @@ export default {
       getAction(this.url.tableList, params).then((res) => {
         if (res.success) {
           if (res.result.current > 1 && res.result.records.length == 0) {
-            this.pageNo = res.result.current - 1
+            this.pageNo = 1
             this.getTableList()
             return
           }

jero-web/src/views/parameter/parameterexport/index.vue

@@ -339,7 +339,7 @@ export default {
       getAction(this.url.list, query).then((res) => {
         if (res.success) {
           if (res.result.current > 1 && res.result.records.length == 0) {
-            this.pageNo = res.result.current - 1
+            this.pageNo = 1
             this.getList()
             return
           }

jero-web/src/views/parameter/parameterlist/components/addModel.vue

@@ -134,7 +134,8 @@
               </div>
             </a-col>
           </a-row>
-          <a-row :gutter="24" v-if='required'>
+<!--          v-if='required'-->
+          <a-row :gutter="24" >
             <a-col :span="24">
               <div class="box-title-text">
                 <div class="title-text">
@@ -248,8 +249,9 @@
               </div>
             </a-col>
           </a-row>
+<!--          v-if='required'-->
           <a-row :gutter="24" >
-            <a-col :span="24" v-if='required'>
+            <a-col :span="24" >
               <a-tabs>
                 <a-tab-pane  v-for='(item,index) in contentList' :tab="item.cut == 'cn' ? item.text : item.textEn" :key="index + 1">
                   <a-row :gutter="24">
@@ -470,11 +472,11 @@ export default {
     },
     controlTypeChange(value){
          this.$refs.ruleForm.clearValidate(['controlVerify','titleDefaultValue','controlValues'])
-      if(value == 11){
-        this.required = false
-      }else {
-        this.required = true
-      }
+      // if(value == 11){
+      //   this.required = false
+      // }else {
+      //   this.required = true
+      // }
     },
     uploadSuccess(data) {
       let attIdList = []
@@ -645,11 +647,11 @@ export default {
       //   value.technologyTerritory = value.technologyTerritory.split(',')
       // }
       this.formInline = value
-      if(this.formInline.controlType == 11){
-        this.required = false
-      }else{
-        this.required = true
-      }
+      // if(this.formInline.controlType == 11){
+      //   this.required = false
+      // }else{
+      //   this.required = true
+      // }
       this.title = this.$t('edit')
       this.flag = 0
       //  获取认证类别
@@ -674,7 +676,8 @@ export default {
       this.$refs['ruleForm'].resetFields()
     },
     handleSubmit() {
-      if(this.formInline.certCategory == undefined && this.formInline.controlType != 11) {
+    // && this.formInline.controlType != 11
+      if(this.formInline.certCategory == undefined ) {
         this.$message.warning(this.$t('certificationCategory')+this.$t('cannotEmpty'))
         return
       }
@@ -736,12 +739,12 @@ export default {
             })
             let querycontentList = JSON.parse(JSON.stringify(this.contentList))
             query.certCategoryParamsInfoEOList = querycontentList
-            if(this.formInline.controlType == 11){
-              query.certCategoryParamsInfoEOList = []
-              query.certCategory = ''
-            }else{
-              query.titleDefaultValue = ''
-            }
+            // if(this.formInline.controlType == 11){
+            //   query.certCategoryParamsInfoEOList = []
+            //   query.certCategory = ''
+            // }else{
+            //   query.titleDefaultValue = ''
+            // }
             this.confirmLoading = true
             Action(url, query).then((res) => {
               if (res.success) {

jero-web/src/views/parameter/parameterlist/index.vue

@@ -390,7 +390,7 @@ export default {
       getAction(this.url.list, query).then((res) => {
         if (res.success) {
           if (res.result.current > 1 && res.result.records.length == 0) {
-            this.pageNo = res.result.current - 1
+            this.pageNo = 1
             this.getList()
             return
           }

jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue

@@ -79,10 +79,14 @@
         <span slot="sponsorFeedback" slot-scope="text,result">
              <a-textarea :placeholder="$t('pleaseEnter')+$t('sponsorFeedback')"
                          v-model.trim="result.sponsorFeedback"
+                         :title="result.sponsorFeedback"
                          onkeyup="this.value=this.value.replace(/(^\s+)|(\s+$)/g, '')"
                          :maxLength="300"
                          :rows="2"/>
         </span>
+        <span slot="sponsorFeedbackIndex" :title="text" slot-scope="text,result">
+              {{text ? text : '--'}}
+        </span>
       </a-table>
     </div>
     <uploadFile ref="uploadFile" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
@@ -193,6 +197,14 @@
             align: 'center',
             width: 180,
             scopedSlots: { customRender: 'complianceResults' }
+          },
+          {
+            title: this.$t('sponsorFeedback'),
+            dataIndex: 'sponsorFeedback',
+            align: 'center',
+            width: 180,
+            ellipsis: true,
+            scopedSlots: { customRender: 'sponsorFeedbackIndex' }
           }
         ],
         columnsThree: [

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

@@ -107,7 +107,7 @@
           <img v-else-if="item.status == 2" src="../../../assets/shijian.png" class="process-content-left" alt="">
           <img v-else-if="item.status == 3" src="../../../assets/xian.png" class="process-content-left" alt="">
           <div class="process-content-right">
-            <div class="process-content-right-top">{{item.name}}</div>
+            <div class="process-content-right-top" :title="item.name">{{item.name}}</div>
             <div class="process-content-right-button">{{item.time?item.time.slice(0,11): item.time}}</div>
           </div>
         </div>

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

@@ -112,7 +112,7 @@
                 {{$t('edit')}}
           </a>
         </span>
-        <span slot="regulatoryEngineer" >
+        <span slot="regulatoryEngineer">
             <span :title="$t('regulatoryEngineer')">
               {{$t('regulatoryEngineer')}}
             </span>
@@ -218,6 +218,7 @@
                 <!--                :prop="'certificationEngineer'"-->
                 <a-form-model-item class="itemModel">
                   <a-select allowClear
+                            class="box-input"
                             v-model="formInline.certificationEngineer"
                             :placeholder="$t('certifiedEngineer')+$t('areaOfResponsibility')">
                     <a-select-option v-for="(item, key) in dictOptionsValue"
@@ -283,18 +284,18 @@
           {
             align: 'center',
             dataIndex: 'lawEngineerName',
-            slots:{title:'regulatoryEngineer'},
+            slots: { title: 'regulatoryEngineer' },
             ellipsis: true
           },
           {
             align: 'center',
-            slots:{title:'engineeringInterfacePerson'},
+            slots: { title: 'engineeringInterfacePerson' },
             dataIndex: 'engineeringInterfacePersonName',
             ellipsis: true
           },
           {
             align: 'center',
-            slots:{title:'certifiedEngineer'},
+            slots: { title: 'certifiedEngineer' },
             dataIndex: 'certificationEngineerName',
             ellipsis: true
           },
@@ -417,10 +418,10 @@
         this.selectedRowKeys = []
         this.getList()
       },
-      handleCancel(){
+      handleCancel() {
         this.visible = false
       },
-      handleSubmit(){
+      handleSubmit() {
         this.visible = false
       },
       batSettingClick() {
@@ -469,6 +470,9 @@
         this.editVisible = true
         this.$nextTick(() => {
           this.formInline = JSON.parse(JSON.stringify(item))
+          if (!(this.dictOptionsValue.some(val => val.certificationEngineer == this.formInline.certificationEngineer))) {
+            this.formInline.certificationEngineer = undefined
+          }
           this.$refs.ruleForm.clearValidate()
         })
       },
@@ -642,11 +646,12 @@
     height: 38px;
     /*margin-top: 2px;*/
   }
+
   .drawer-bootom-button {
     position: absolute;
     bottom: 0;
     width: 100%;
-    z-index:100;
+    z-index: 100;
     border-top: 1px solid #e8e8e8;
     padding: 10px 16px;
     text-align: right;

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

@@ -353,7 +353,7 @@
         postAction(this.url.list, query).then((res) => {
           if (res.success) {
             if (res.result.current > 1 && res.result.records.length == 0) {
-              this.pageNo = res.result.current - 1
+              this.pageNo = 1
               this.getList()
               return
             }

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

@@ -342,6 +342,11 @@
         this.loading = true
         getAction(this.url.page, query).then((res) => {
           if (res.success) {
+            if (res.result.current > 1 && res.result.records.length == 0) {
+              this.pageNo = 1
+              this.getList()
+              return
+            }
             this.dataSource = res.result.records || []
             this.total = res.result.total
             this.loading = false

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

@@ -359,13 +359,11 @@ export default {
       postAction(this.url.list, query).then((res) => {
         if (res) {
           if (res.result.current > 1 && res.result.records.length == 0) {
-            this.pageNo = res.result.current - 1
+            this.pageNo = 1
             this.getList()
             return
           }
-          console.log(res.result)
           this.dataSource = res.result.records || []
-
           this.total = res.result.total
           this.loading = false
         } else {