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

jero-web/src/views/documentManage/tags/dialog/ListTable.vue

@@ -71,6 +71,13 @@
             ellipsis: true,
             width: 100
           },
+          {
+            title: this.$t('DisplayOrder'),
+            align: 'left',
+            width: 100,
+            ellipsis: true,
+            dataIndex: 'sortOrder'
+          },
           {
             title: this.$t('describe'),
             align: 'left',

jero-web/src/views/documentManage/tags/dialog/TreeTable.vue

@@ -73,6 +73,13 @@
             ellipsis: true,
             width: 100
           },
+          {
+            title: this.$t('DisplayOrder'),
+            align: 'left',
+            width: 100,
+            ellipsis: true,
+            dataIndex: 'sortOrder'
+          },
           {
             title: this.$t('describe'),
             dataIndex: 'description',

jero-web/src/views/phoneView/myCollection.vue

@@ -53,7 +53,7 @@
             <!--               {{item.serialNumber}}-->
             <!--            </span>-->
             <!--            </div>-->
-            <div class="content-text-button">
+            <div class="content-text-top">
               <span> {{item.title}}</span>
             </div>
           </div>
@@ -273,7 +273,7 @@
   }
 
   .content-text-button {
-    font-size: 0.42rem;
+    font-size: 0.37rem;
     font-family: PingFang SC-Regular, PingFang SC;
     font-weight: 400;
     color: #595E72;

jero-web/src/views/phoneView/mySubscribe.vue

@@ -176,7 +176,7 @@
   }
 
   .content-text-button {
-    font-size: 0.42rem;
+    font-size: 0.37rem;
     font-family: PingFang SC-Regular, PingFang SC;
     font-weight: 400;
     color: #595E72;

jero-web/src/views/phoneView/preHomoMangement.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="box">
     <div class="header-search">
-<!--      <van-icon @click="iconClick" class="icon" name="arrow-left"/>-->
+      <!--      <van-icon @click="iconClick" class="icon" name="arrow-left"/>-->
       <span class="header-search-text">
             {{$route.query.projectName + ' ' + $t('preHomoFlow')}}
         </span>
@@ -35,8 +35,14 @@
           <span class="content-box-text">{{queryForm.dutyTerritoryName || '--'}}</span>
         </div>
         <div class="content-box-type">
-          <span class="content-box-left">{{$t('engineeringInterfacePerson')}}</span>
+          <span class="content-box-left">{{$t('certifiedEngineer')}}</span>
-          <span class="content-box-text">{{queryForm.sdtName || '--'}}</span>
+          <span class="content-box-text" v-if="certificationEngineerName && certificationEngineerName.length > 0">
+            <span class="content-box-textList"
+                  v-for="(item,index) in certificationEngineerName" :key="index">
+              {{item}}
+            </span>
+          </span>
+          <span class="content-box-text" v-else>--</span>
         </div>
       </van-collapse-item>
 
@@ -280,6 +286,7 @@
         deliverablesResultFile: [],
         deliveryResultList: [],
         isDisplay: false,
+        certificationEngineerName: [],
         url: {
           queryProjectCertificationInventoryById: '/phone/toDoCenter/queryProjectCertificationInventoryById',
           saveBatch: '/project/projectCertificationInventoryEO/saveBatch'
@@ -295,7 +302,6 @@
       iconClick() {
         this.$router.go(-1)
       },
-
       getFileInfos(item) {
         getAction('sys/common/getFileInfos', { id: item }).then((res) => {
           if (res.success) {
@@ -450,11 +456,26 @@
               this.getDeliveryResult(this.queryForm.deliverableTemplate)
             }
             this.queryForm = { ...this.queryForm }
+            this.getForm()
           } else {
             this.queryForm = {}
           }
         })
       },
+      getForm() {
+        getAction('project/projectLibraryBase/queryById',
+          { id: this.queryForm.projectLibraryId }).then((res) => {
+          if (res.success) {
+            this.certificationEngineerName = []
+            this.certificationEngineerName = res.result[0].certificationEngineerName || ''
+            if (this.certificationEngineerName && typeof this.certificationEngineerName == 'string') {
+              this.certificationEngineerName = this.certificationEngineerName.split(',')
+            } else {
+              this.certificationEngineerName = []
+            }
+          }
+        })
+      },
       async upload(file) {
         // 这时候我们创建一个formData对象实例
         const formData = new FormData()
@@ -498,10 +519,10 @@
         if (!this.isBrowser()) {
           Dialog.alert({
             message: '未授权用户 <br> Unauthorized User',
-            theme: 'round-button',
+            theme: 'round-button'
           }).then(() => {
             // on close
-          });
+          })
           return
         }
         let url = kkFileView(item.fileName, item.id)
@@ -975,4 +996,14 @@
   ::v-deep .productionEnterpriseName .van-field__error-message {
     display: none;
   }
+
+  .content-box-textList {
+    display: inline-block;
+    width: 100%;
+    font-size: 0.38rem;
+    font-family: PingFang SC-Regular, PingFang SC;
+    font-weight: 500;
+    color: #040B29;
+    word-break: break-all;
+  }
 </style>

jero-web/src/views/phoneView/recentBrowsing.vue

@@ -194,7 +194,7 @@
   }
 
   .content-text-button {
-    font-size: 0.42rem;
+    font-size: 0.37rem;
     font-family: PingFang SC-Regular, PingFang SC;
     font-weight: 400;
     color: #595E72;