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

# Conflicts:
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js

jero-web/src/common/lang/en-us.js

@@ -1409,7 +1409,7 @@ module.exports = {
   itemInformation:'Item Information',
   modifyHistory:'Historical Record',
   returnToStudio:'Return to Studio',
-  Approved:'Review and pass',
+  Approved:'Approved',
   returnedForApproval:'Returned For Approval',
   changeSetting:'Change Setting',
   referenceDeliverables:'Reference Deliverables',
@@ -1430,8 +1430,8 @@ module.exports = {
   onlyDataStatusSubmittedCanBeSelected:'Only data with process status of result to be submitted can be selected',
   operationWithoutPermission:'Operation without permission',
   data:"'s data",
-  confirmApproval:'Confirm approval?',
-  confirmReturnForApproval:'Confirm return for approval ?',
+  confirmApproval:'Confirm pass review?',
+  confirmReturnForApproval:'Confirm Return for review ?',
   onlyDataStatusResultReviewedCanBeSelected:'Only data with process status of result to be reviewed can be selected',
   confirmResetProcess:'Confirm reset process?',
   confirmUrging:'Confirm urging ?',
@@ -1757,4 +1757,6 @@ module.exports = {
   toBeTracked:'To be tracked',
   NA:'NA',
   electroniccontrollerparameter:'Electronic controller parameter',
+  reviewAndPass:'Review and pass',
+  reviewAndReturn:'Review and return',
 }

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

@@ -1511,7 +1511,7 @@ module.exports = {
   itemInformation:'条目信息',
   modifyHistory:'历史记录',
   returnToStudio:'退回至Studio',
-  Approved:'审查通过',
+  Approved:'审批通过',
   returnedForApproval:'审批退回',
   changeSetting:'修改配置',
   referenceDeliverables:'引用交付物',
@@ -1532,8 +1532,8 @@ module.exports = {
   data:"的数据",
   compliancereport:'生成合规报告',
   todocenter:'待办中心',
-  confirmApproval:'确认通过审批？',
-  confirmReturnForApproval:'确认退回审批？',
+  confirmApproval:'确认通过审查？',
+  confirmReturnForApproval:'确认退回审查？',
   onlyDataStatusResultReviewedCanBeSelected:'只能选择流程状态为结果待审查的数据',
   confirmResetProcess:'确认重置流程?',
   confirmUrging:'确认催办',
@@ -1858,5 +1858,7 @@ module.exports = {
   nonCompliance:'不符合',
   toBeTracked:'待追踪',
   NA:'不涉及',
+  reviewAndPass:'审查通过',
+  reviewAndReturn:'审查退回',
   electroniccontrollerparameter:'电子控制器参数',
 }

jero-web/src/views/documentManage/library/docDetail/index.vue

@@ -58,7 +58,7 @@
                   <span v-if="ol.field_show_type == 10" class="text-field-left-Index" :title="ol.db_field_txt">{{ol.db_field_txt}}</span>
                   <span v-else class="text-field-left" :title="ol.db_field_txt">{{ol.db_field_txt}}</span>
                   <span class="text-field-right text-field-right-text" v-if="index1 == 9"
-                        :title="ol.value">{{ol.value ? ol.value+'的时间更好的付款就给和看景点风光和的空间古典风格' : '--'}}</span>
+                        :title="ol.value">{{ol.value ? ol.value : '--'}}</span>
                   <span class="text-field-right text-field-right-color" v-else-if="ol.urlClick" @click="urlClick(ol)"
                         :title="ol.value">{{ol.value ? ol.value : '--'}}</span>
                   <span class="text-field-right" v-else-if="ol.field_show_type == 7">

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

@@ -29,7 +29,7 @@
                     <a-select-option v-for="(item, key) in projectNameList"
                                      :label="item.serialNumber"
                                      :key="key"
-                                     :value="item.id">
+                                     :value="item.standId">
                      <span style="display: inline-block;width: 100%"
                            :title=" item.serialNumber ">
                            {{ item.serialNumber}}
@@ -808,7 +808,7 @@
           return res.id === value
         })
         if (content && content.length > 0) {
-          this.formInline.bussDocumentLibraryId = content[0].id
+          this.formInline.bussDocumentLibraryId = content[0].standId
           this.formInline.serialNumber = content[0].serialNumber
         }
       },

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

@@ -205,14 +205,14 @@
         <div @click="ApprovedClick('rzgcssc_tg',$t('confirmApproval'))" v-if="roleSwitchingCode == 2"
              class="operator-text">
           <a-icon type="check-circle"/>
-          {{ $t('Approved') }}
+          {{ $t('reviewAndPass') }}
         </div>
 
         <!--        审批退回-->
         <div @click="ApprovedClick('rzgcssc_th',$t('confirmReturnForApproval'))" v-if="roleSwitchingCode == 2"
              class="operator-text">
           <a-icon type="close-circle"/>
-          {{ $t('returnedForApproval') }}
+          {{ $t('reviewAndReturn') }}
         </div>
 
         <!--        任务接受-->