Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

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

@@ -680,8 +680,9 @@
       uploadFileChangeDown
     },
     mounted() {
+      console.log(this.detailDate)
       this.detailDate.list.forEach((item) => {
-        if (item.type === 'pull_more') {
+        if (item.type === 'pull_more' && !item.dataValue) {
           item.dataValue = []
         }
         // this.detailDatetransformation.push(item)
@@ -737,11 +738,11 @@
     },
     watch: {
       detailDate(newold, oldold) {
-        console.log(newold, oldold, 'll')
+        // console.log(newold, oldold, 'll')
       },
       formInline: {
         handler(newOld, oldval) {
-          console.log(newOld, oldval, 'll')
+          // console.log(newOld, oldval, 'll')
         },
         deep: true
       }

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

@@ -220,10 +220,10 @@
         type: Object,
         default: true
       },
-      queryParamQuery: {
-        type: Object,
-        default: true
-      },
+      // queryParamQuery: {
+      //   type: Object,
+      //   default: true
+      // },
       currentPersonRole: {
         type: String,
         default: true
@@ -649,7 +649,6 @@
               }
             })
             this.columns = [...this.columns]
-            console.log(this.columns)
           }
         })
       },
@@ -726,9 +725,6 @@
         this.selectedRowKeys = []
       },
       getTableList(currentPersonRole) {
-        console.log(currentPersonRole)
-        console.log(this.queryParamQuery)
-        // todo
         let paramsManifestid
         let url
         if (this.$route.query.it === undefined) {
@@ -752,7 +748,6 @@
         this.loading = true
         getAction(url, params).then((res) => {
           if (res.success) {
-            // todo
             // console.log(res.result,'res.result')
             // let tt = []
             // this.dataSource = []
@@ -771,13 +766,14 @@
             // })
             let tt = []
             if (this.currentPersonRole !== 'dre') {
+              console.log(res.result.records,'res.result.records')
               res.result.records.forEach((Obj) => {
                 Object.keys(Obj).forEach((item) => {
                   if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) {
                     Obj[item].list.forEach((itemLi) => {
                       itemLi.isLock = 1
                       if (itemLi.type === 'pull_more') {
-                        itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',')
+                        itemLi.dataValue = !itemLi.dataValue ? [] : itemLi.dataValue.split(',')
                       }
                     })
                   }
@@ -790,7 +786,7 @@
                   if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) {
                     Obj[item].list.forEach((itemLi) => {
                       if (itemLi.type === 'pull_more') {
-                        itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.split(',')
+                        itemLi.dataValue = !itemLi.dataValue ? [] : itemLi.dataValue.split(',')
                       }
                     })
                   }
@@ -798,7 +794,7 @@
                 tt.push(Obj)
               })
             }
-            this.dataSource = tt
+            this.dataSource = JSON.parse(JSON.stringify(tt))
             this.total = res.result.total
             this.selectedRowKeys = []
             this.selectedRowrowValue = []

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

@@ -62,7 +62,7 @@ import { mapGetters } from 'vuex'
       }
     },
     created() {
-      console.log(this.detailDate, 'detailDate')
+      // console.log(this.detailDate, 'detailDate')
       // this.detailDate.list.forEach((item) => {
       //   if (item.type == 'file' && item.isLock == '1') {
       //     this.disabled = true

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

@@ -235,6 +235,7 @@
         let query = {
           pageNo: this.pageNo,
           pageSize: this.pageSize,
+          createBy: this.userInfo().username,
           ...queryParam
         }
         this.loading = true
@@ -476,7 +477,8 @@
   .text-operation {
     margin-right: 8px;
   }
-  ::v-deep .ant-select-dropdown{
+
+  ::v-deep .ant-select-dropdown {
     z-index: 100;
   }
 </style>

jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue

@@ -44,8 +44,10 @@
                   <span class="title-text-text" :title="$t('selectedStandard')">{{$t('selectedStandard')}}</span>
                 </div>
                 <div class="title-text-content"
+                     :title="selectedRowKeysRecord[0] ? selectedRowKeysRecord[0].serialNumber+' - '+selectedRowKeysRecord[0].title:''"
                      :class="{'title-text-content-one':!isTrue}">
-                  {{selectedRowKeysRecord[0] ? selectedRowKeysRecord[0].serialNumber+' - '+selectedRowKeysRecord[0].title:''}}
+                  {{selectedRowKeysRecord[0] ?
+                  selectedRowKeysRecord[0].serialNumber+'-'+selectedRowKeysRecord[0].title:''}}
                 </div>
                 <div class="title-text-right" v-if="isTrue">
                   <span :title="$t('standardDecompositionDocument')" @click="standardDecompositionDocumentClick">
@@ -323,7 +325,7 @@
         this.formInline.lawsTechnologyEvaluationId = this.$route.query.lawsTechnologyEvaluationId
         this.formInline.remark = this.$route.query.remark
         this.formInline.standId = this.$route.query.standId
-        this.formInline = {...this.formInline}
+        this.formInline = { ...this.formInline }
         this.getListOne()
       }
       eventBUs.$on('searchQuery', search => {
@@ -697,6 +699,9 @@
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
+    word-break: break-word;
+    padding: 0 14px;
+    box-sizing: border-box;
   }
 
   .title-text-right {
@@ -710,6 +715,9 @@
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
+    word-break: break-word;
+    padding: 0 14px;
+    box-sizing: border-box;
     color: #21c9cc;
     cursor: pointer;
   }

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

@@ -168,7 +168,8 @@
                   {{$t('Adjustareasofresponsibility')}}
                 </div>
               </template>
-              <div class="operator-text" style="position: relative " @click='morepop' v-if='currentPersonRole == "homo" || currentPersonRole == "sdt"'>
+<!--              @click='morepop'-->
+              <div class="operator-text" style="position: relative "  v-if='currentPersonRole == "homo" || currentPersonRole == "sdt"'>
                 <span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }}
               </div>
             </a-popconfirm>
@@ -226,8 +227,9 @@
           </div>
           <div style="width: 100%">
             <!-- 表格-10控件-->
+<!--            :queryParamQuery='queryParamQuery'-->
             <table-collection ref="CollectionTabel" :url='url' :paramsManifest='paramsManifest' @rowValue='rowValue'
-                              :formInline='formInline' :queryParamQuery='queryParamQuery' :currentPersonRole='currentPersonRole'
+                              :formInline='formInline'  :currentPersonRole='currentPersonRole'
                               @getDataSource="getDataSource"
                               @handlePreservation="handlePreservation"
                               @value='value'