合并分支 'fix_2nd_period' 到 'master'

Fix 2nd period

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

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java

@@ -131,7 +131,7 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl<LawsMonthl
 			query.in("create_by",sysUser.getUsername()).in("issue_status", InventoryStateEnum.TO_BE_RELEASED.getValue())
 					.or().in("issue_status",InventoryStateEnum.ISSUE.getValue());
 		});
-		queryWrapper.orderByDesc("create_time");
+		queryWrapper.orderByDesc("name");
 		Page<LawsMonthlyReportManageEO> pageInfo = this.page(page, queryWrapper);
 		return pageInfo;
 	}

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

@@ -450,12 +450,13 @@
         this.$refs.SelectedByRef.getPush()
       },
       detailClick(item,key) {
-        this.$router.push({
+        let newUrl = this.$router.resolve({
           path: '/docManage/library/detail',
           query: {
             id: item.bussDocumentLibraryId.split(',')[key]
-          },
+          }
         })
+        window.open(newUrl.href, '_blank')
       },
       SelectedByForm(userIds) {
         let query = {

jero-web/src/views/documentTools/virtualList/components/editModel.vue

@@ -18,7 +18,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="standard">
                 <a-input class="box-input"
-                         :disabled="true"
+                         :disabled="false"
                          v-model="formInline.serialNumber"
                          :placeholder="$t('PleaseEnter')+$t('standard')"/>
               </a-form-model-item>

jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue

@@ -88,7 +88,7 @@
           },
           {
             title: this.$t('title'),
-            value: 'title'
+            value: localStorage.getItem('language') && localStorage.getItem('language') == 'zh-cn'?'title':'title_en'
           },
           {
             title: this.$t('regulatoryEngineer'),

jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue

@@ -72,7 +72,7 @@
           },
           {
             title: this.$t('title'),
-            value: 'title'
+            value: localStorage.getItem('language') && localStorage.getItem('language') == 'zh-cn'?'title':'title_en'
           },
           {
             title: this.$t('regulatoryEngineer'),

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

@@ -18,7 +18,7 @@
               </div>
               <a-form-model-item class="itemModel" prop="serialNumber">
                 <a-input class="box-input"
-                         :disabled="true"
+                         :disabled="false"
                          v-model="formInline.serialNumber"
                          :placeholder="$t('PleaseEnter')+$t('standard')"/>
               </a-form-model-item>

jero-web/src/views/system/UserAnnouncementList.vue

@@ -7,7 +7,7 @@
           <a-col :md="6" :sm="8" style="line-height: 48px">
             <div class="box-title-text">
               <div class="title-text" :title="$t('MessageContent')">
-                <span>{{this.$t('MessageContent')}}</span>
+                <span>{{ this.$t('MessageContent') }}</span>
               </div>
               <a-input class="box-input"
                        :placeholder="$t('pleaseEnter')+$t('MessageContent')"
@@ -18,16 +18,16 @@
           <a-col :md="6" :sm="8" style="line-height: 48px">
             <div class="box-title-text">
               <div class="title-text" :title="$t('MessageType')">
-                <span>{{this.$t('MessageType')}}</span>
+                <span>{{ this.$t('MessageType') }}</span>
               </div>
               <a-select class="box-input"
                         :placeholder="$t('pleaseSelect')+$t('MessageType')"
                         v-model="queryParam.msgCategory">
-                <a-select-option :value="undefined">{{$t('pleaseSelect')}}</a-select-option>
+                <a-select-option :value="undefined">{{ $t('pleaseSelect') }}</a-select-option>
                 <a-select-option v-for="(item, key) in Object.keys(msgCategoryQuery)"
                                  :key="key" :value="item">
                   <span style="display: inline-block;width: 100%" :title="msgCategoryQuery[item]">
-                               {{ msgCategoryQuery[item]}}
+                               {{ msgCategoryQuery[item] }}
                     </span>
                 </a-select-option>
               </a-select>
@@ -35,8 +35,9 @@
           </a-col>
           <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
                <a-col :md="6" :sm="24">
-                  <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+                  <a-button class="box-button" type="primary" @click="searchQuery">{{ $t('query') }}</a-button>
-                  <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+                  <a-button class="box-button" style="margin-left: 8px"
+                            @click="searchReset">{{ $t('reset') }}</a-button>
                </a-col>
          </span>
 
@@ -46,12 +47,12 @@
 
     <div class="table-operator">
       <div @click="readAll" class="operator-text" :title="$t('AllLabelsRead')">
-        <a-icon type="eye"/>
+        <a-icon type="eye" />
-        {{$t('AllLabelsRead')}}
+        {{ $t('AllLabelsRead') }}
       </div>
       <div @click="handleDel" class="operator-text">
-        <a-icon type="delete"/>
+        <a-icon type="delete" />
-        {{$t('BatchDelete')}}
+        {{ $t('BatchDelete') }}
       </div>
     </div>
 
@@ -63,7 +64,7 @@
       :dataSource="dataSource"
       :scroll="{x: '100%'}"
       :pagination="ipagination"
-      :expandIconAsCell='false'
+      :expandIconAsCell="false"
       :expandIconColumnIndex="5"
       :expandIcon="expandIcon"
       :expandRowByClick="true"
@@ -74,13 +75,13 @@
 <!--         @click="msgContentClick(scope)"-->
            <a :style="{'color':scope.readFlag == 0 ? 'red':'#00A0E9'}"
               :title="language == 'zh-cn' && scope.msgContentCn? scope.msgContentCn : scope.msgContent">
-             {{language == 'zh-cn' && scope.msgContentCn? scope.msgContentCn : scope.msgContent}}
+             {{ language == 'zh-cn' && scope.msgContentCn ? scope.msgContentCn : scope.msgContent }}
            </a>
       </span>
       <span slot="msgCategory" slot-scope="text,scope">
 <!--        :style="{'color':scope.readFlag == 0 ? 'red':'#00A0E9'}" @click="msgContentClick(scope)"-->
            <span :title="msgCategoryQuery[text]">
-             {{msgCategoryQuery[text]}}
+             {{ msgCategoryQuery[text] }}
            </span>
       </span>
       <p slot="expandedRowRender" slot-scope="record" style="margin: 0;padding-left: 58px;">
@@ -89,300 +90,348 @@
       </p>
     </a-table>
     <show-announcement ref="ShowAnnouncement"></show-announcement>
-    <dynamic-notice ref="showDynamNotice" :path="openPath" :formData="formData"/>
+    <dynamic-notice ref="showDynamNotice" :path="openPath" :formData="formData" />
   </a-card>
 </template>
 
 <script>
-  import { filterObj } from '@/utils/util'
+import { filterObj } from '@/utils/util'
-  import { getAction, putAction, deleteAction } from '@/api/manage'
+import { getAction, putAction, deleteAction } from '@/api/manage'
-  import ShowAnnouncement from '@/components/tools/ShowAnnouncement'
+import ShowAnnouncement from '@/components/tools/ShowAnnouncement'
-  import { JeroListMixin } from '@/mixins/JeroListMixin'
+import { JeroListMixin } from '@/mixins/JeroListMixin'
-  import DynamicNotice from '../../components/tools/DynamicNotice'
+import DynamicNotice from '../../components/tools/DynamicNotice'
+import Vue from 'vue'
+import { ACCESS_TOKEN } from '@/store/mutation-types'
 
-  export default {
+export default {
-    name: 'UserAnnouncementList',
+  name: 'UserAnnouncementList',
-    mixins: [JeroListMixin],
+  mixins: [JeroListMixin],
-    components: {
+  components: {
-      DynamicNotice,
+    DynamicNotice,
-      ShowAnnouncement
+    ShowAnnouncement
-    },
+  },
-    data() {
+  data() {
-      return {
+    return {
-        description: '系统通告表管理页面',
+      description: '系统通告表管理页面',
-        queryParam: {},
+      queryParam: {},
-        selectedRowKeys: [],
+      selectedRowKeys: [],
-        // '5': this.$t('taskRegulationComplianceTask'),
+      // '5': this.$t('taskRegulationComplianceTask'),
-        msgCategoryQuery: {
+      msgCategoryQuery: {
-          '1': this.$t('SubscriptionNotification'),
+        '1': this.$t('SubscriptionNotification'),
-          '2': this.$t('warningInformation'),
+        '2': this.$t('warningInformation'),
-          '3': this.$t('ForwardPush')
+        '3': this.$t('ForwardPush')
-          // '4': this.$t('CollectinguthenticationParameters'),
+        // '4': this.$t('CollectinguthenticationParameters'),
-          // '6':this.$t('RegulationListConfirmationTask'),
+        // '6':this.$t('RegulationListConfirmationTask'),
-          // '7':this.$t('RegulationListConfirmationNotification'),
+        // '7':this.$t('RegulationListConfirmationNotification'),
-          // '8':this.$t('RegulationTaskConfirmation'),
+        // '8':this.$t('RegulationTaskConfirmation'),
-          // '9':this.$t('DesignComplianceTask'),
+        // '9':this.$t('DesignComplianceTask'),
-          // '10':this.$t('PreHomoTask'),
+        // '10':this.$t('PreHomoTask'),
-          // '11':this.$t('ValidationTask'),
+        // '11':this.$t('ValidationTask'),
-          // '12':this.$t('DesignComplianceNotification'),
+        // '12':this.$t('DesignComplianceNotification'),
-          // '13':this.$t('PreHomoNotification'),
+        // '13':this.$t('PreHomoNotification'),
-          // '14':this.$t('ValidationComplianceNotification'),
+        // '14':this.$t('ValidationComplianceNotification'),
-          // '15':this.$t('RegulationTaskConfirmationNotification'),
+        // '15':this.$t('RegulationTaskConfirmationNotification'),
-          // '17':this.$t('listConfirmation'),
+        // '17':this.$t('listConfirmation'),
-          // '18':this.$t('taskAffirm'),
+        // '18':this.$t('taskAffirm'),
-          // '19':this.$t('complianceConfirmation'),
+        // '19':this.$t('complianceConfirmation'),
-          // '20':this.$t('collectionLegislativeComments'),
+        // '20':this.$t('collectionLegislativeComments'),
-          // '21':this.$t('regulatoryAndTechnicalAssessment'),
+        // '21':this.$t('regulatoryAndTechnicalAssessment'),
+      },
+      columns: [
+        {
+          title: this.$t('MessageContent'),
+          align: 'left',
+          dataIndex: 'msgContent',
+          ellipsis: true,
+          scopedSlots: { customRender: 'msgTitile' }
         },
-        columns: [
+        {
-          {
+          title: this.$t('Sponsor'),
-            title: this.$t('MessageContent'),
+          align: 'left',
-            align: 'left',
+          ellipsis: true,
-            dataIndex: 'msgContent',
+          dataIndex: 'initiator',
-            ellipsis: true,
+          width: 200
-            scopedSlots: { customRender: 'msgTitile' }
-          },
-          {
-            title: this.$t('Sponsor'),
-            align: 'left',
-            ellipsis: true,
-            dataIndex: 'initiator',
-            width: 200
-          },
-          {
-            title: this.$t('MessageType'),
-            align: 'left',
-            ellipsis: true,
-            dataIndex: 'msgCategory',
-            width: 200,
-            scopedSlots: { customRender: 'msgCategory' }
-          },
-          {
-            title: this.$t('NotificationTime'),
-            align: 'left',
-            ellipsis: true,
-            width: 200,
-            dataIndex: 'sendTime'
-          },
-          {
-            title: '',
-            align: 'left',
-            ellipsis: true,
-            width: 50
-          }
-        ],
-        url: {
-          list: '/sys/sysAnnouncementSend/getMyAnnouncementSend',
-          editCementSend: 'sys/sysAnnouncementSend/editByAnntIdAndUserId',
-          readAllMsg: 'sys/sysAnnouncementSend/read',
-          deleteUrl: 'sys/sysAnnouncementSend/deleteBatch'
         },
-        loading: false,
+        {
-        openPath: '',
+          title: this.$t('MessageType'),
-        formData: '',
+          align: 'left',
-        language: ''
+          ellipsis: true,
+          dataIndex: 'msgCategory',
+          width: 200,
+          scopedSlots: { customRender: 'msgCategory' }
+        },
+        {
+          title: this.$t('NotificationTime'),
+          align: 'left',
+          ellipsis: true,
+          width: 200,
+          dataIndex: 'sendTime'
+        },
+        {
+          title: '',
+          align: 'left',
+          ellipsis: true,
+          width: 50
+        }
+      ],
+      url: {
+        list: '/sys/sysAnnouncementSend/getMyAnnouncementSend',
+        editCementSend: 'sys/sysAnnouncementSend/editByAnntIdAndUserId',
+        readAllMsg: 'sys/sysAnnouncementSend/read',
+        deleteUrl: 'sys/sysAnnouncementSend/deleteBatch'
+      },
+      loading: false,
+      openPath: '',
+      formData: '',
+      language: ''
+    }
+  },
+  watch: {
+    $route: function(res) {
+      console.log(res)
+      this.loadData()
+    }
+  },
+  mounted() {
+    this.language = localStorage.getItem('language') || ''
+  },
+  methods: {
+    expandIcon(props) {
+      if (props.expanded) {
+        return <a-icon type="down" onClick={e => {
+          props.onExpand(props.record, e)
+        }
+        }
+        />
+      } else {
+        return <a-icon type="right" onClick={e => {
+          props.onExpand(props.record, e)
+        }
+        }
+        />
       }
     },
-    watch: {
+    loadData(arg) {
-      $route: function(res) {
+      if (!this.url.list) {
-        console.log(res)
+        this.$message.error('请设置url.list属性!')
-        this.loadData()
+        return
+      }
+      //加载数据 若传入参数1则加载第一页的内容
+      if (arg === 1) {
+        this.ipagination.current = 1
+      }
+
+      var params = this.getQueryParams()//查询条件
+      this.loading = true
+      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 (this.dataSource && this.dataSource.length > 0) {
+            this.dataSource.forEach(val => {
+              if (val.msgContentInfoCn && val.msgContentInfoCn.includes('/common/downLoadFile')) {
+                let index = val.msgContentInfoCn.indexOf('target')
+                val.msgContentInfoCn = val.msgContentInfoCn.slice(0, index - 2) + '&token=' + Vue.ls.get(ACCESS_TOKEN) + '\' '
+                  + val.msgContentInfoCn.slice(index)
+              }
+              if (val.msgContentInfo && val.msgContentInfo.includes('/common/downLoadFile')) {
+                let index = val.msgContentInfo.indexOf('target')
+                val.msgContentInfo = val.msgContentInfo.slice(0, index - 2) + '&token=' + Vue.ls.get(ACCESS_TOKEN) + '\' '
+                  + val.msgContentInfo.slice(index)
+              }
+            })
+          }
+
+          if (res.result.total) {
+            this.ipagination.total = res.result.total
+          } else {
+            this.ipagination.total = 0
+          }
+          //update-end---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
+        }
+        if (res.code === 510) {
+          this.$message.warning(res.message)
+        }
+        this.loading = false
+      })
+    },
+    getQueryParams() {
+      //获取查询条件
+      let sqp = {}
+      if (this.superQueryParams) {
+        sqp['superQueryParams'] = encodeURI(this.superQueryParams)
+        sqp['superQueryMatchType'] = this.superQueryMatchType
+      }
+      if (localStorage.getItem('msgContent')) {
+        this.queryParam.msgContent = localStorage.getItem('msgContent')
+        this.queryParam = { ...this.queryParam }
+        localStorage.removeItem('msgContent')
+      }
+      var param = Object.assign(sqp, this.queryParam, this.isorter, this.filters)
+      param.field = this.getQueryField()
+      param.pageNo = this.ipagination.current
+      param.pageSize = this.ipagination.pageSize
+      return filterObj(param)
+    },
+    showAnnouncement(record) {
+      putAction(this.url.editCementSend, { anntId: record.anntId }).then((res) => {
+        if (res.success) {
+          this.loadData()
+          this.syncHeadNotic(record.anntId)
+        }
+      })
+      if (record.openType === 'component') {
+        this.openPath = record.openPage
+        this.formData = { id: record.busId }
+        this.$refs.showDynamNotice.detail()
+      } else {
+        this.$refs.ShowAnnouncement.detail(record)
       }
     },
-    mounted() {
+    expandChange(isTrue, val) {
-      this.language = localStorage.getItem('language') || ''
+      if (isTrue) {
+        if (val.readFlag == '0') {
+          this.msgContentClick(val)
+        }
+      }
     },
-    methods: {
+    readAll() {
-      expandIcon(props) {
+      var that = this
-        if (props.expanded) {
+      if (this.selectedRowKeys.length > 0) {
-          return <a-icon type = 'down'onClick = { e=>
+        that.$confirm({
-          {
+          content: that.$t('AreAllLabelsRead'),
-            props.onExpand(props.record, e)
+          onOk: function() {
-          }
+            let selectedRowKeys = JSON.parse(JSON.stringify(that.selectedRowKeys))
-        }
+            getAction(that.url.readAllMsg, { ids: selectedRowKeys.join(',') }).then((res) => {
-          />;
+              if (res.success) {
-        } else {
+                that.selectedRowKeys = []
-          return <a-icon type = 'right' onClick = { e =>
+                that.$message.success(that.$t('OperationSuccessful'))
-          {
+                that.loadData()
-            props.onExpand(props.record, e)
+              } else {
-          }
+                that.$message.success(that.$t('operationFailed'))
-        }
+              }
-          />;
+            })
-        }
-      },
-      getQueryParams() {
-        //获取查询条件
-        let sqp = {}
-        if (this.superQueryParams) {
-          sqp['superQueryParams'] = encodeURI(this.superQueryParams)
-          sqp['superQueryMatchType'] = this.superQueryMatchType
-        }
-        if (localStorage.getItem('msgContent')) {
-          this.queryParam.msgContent = localStorage.getItem('msgContent')
-          this.queryParam = { ...this.queryParam }
-          localStorage.removeItem('msgContent')
-        }
-        var param = Object.assign(sqp, this.queryParam, this.isorter, this.filters)
-        param.field = this.getQueryField()
-        param.pageNo = this.ipagination.current
-        param.pageSize = this.ipagination.pageSize
-        return filterObj(param)
-      },
-      showAnnouncement(record) {
-        putAction(this.url.editCementSend, { anntId: record.anntId }).then((res) => {
-          if (res.success) {
-            this.loadData()
-            this.syncHeadNotic(record.anntId)
           }
         })
-        if (record.openType === 'component') {
+      } else {
-          this.openPath = record.openPage
+        this.$message.warning(this.$t('PleaseSelectData'))
-          this.formData = { id: record.busId }
+      }
-          this.$refs.showDynamNotice.detail()
+    },
-        } else {
+    onSelectChange(value) {
-          this.$refs.ShowAnnouncement.detail(record)
+      this.selectedRowKeys = value
-        }
+    },
-      },
+    msgContentClick(row) {
-      expandChange(isTrue, val) {
+      getAction(this.url.readAllMsg, { ids: row.id }).then((res) => {
-        if (isTrue) {
+        // this.loadData()
-          if (val.readFlag == '0') {
+      })
-            this.msgContentClick(val)
+      // this.$router.push({
+      //   path: '/system/MessageDetails',
+      //   query: row
+      // })
+    },
+    handleDel() {
+      var that = this
+      if (this.selectedRowKeys.length > 0) {
+        that.$confirm({
+          content: that.$t('ConfirmBatchDeletion'),
+          onOk: function() {
+            let selectedRowKeys = JSON.parse(JSON.stringify(that.selectedRowKeys))
+            deleteAction(that.url.deleteUrl, { ids: selectedRowKeys.join(',') }).then((res) => {
+              if (res.success) {
+                that.selectedRowKeys = []
+                that.$message.success(that.$t('OperationSuccessful'))
+                that.loadData()
+              } else {
+                that.$message.warning(that.$t('operationFailed'))
+              }
+            })
           }
-        }
-      },
-      readAll() {
-        var that = this
-        if (this.selectedRowKeys.length > 0) {
-          that.$confirm({
-            content: that.$t('AreAllLabelsRead'),
-            onOk: function() {
-              let selectedRowKeys = JSON.parse(JSON.stringify(that.selectedRowKeys))
-              getAction(that.url.readAllMsg, { ids: selectedRowKeys.join(',') }).then((res) => {
-                if (res.success) {
-                  that.selectedRowKeys = []
-                  that.$message.success(that.$t('OperationSuccessful'))
-                  that.loadData()
-                } else {
-                  that.$message.success(that.$t('operationFailed'))
-                }
-              })
-            }
-          })
-        } else {
-          this.$message.warning(this.$t('PleaseSelectData'))
-        }
-      },
-      onSelectChange(value) {
-        this.selectedRowKeys = value
-      },
-      msgContentClick(row) {
-        getAction(this.url.readAllMsg, { ids: row.id }).then((res) => {
-          // this.loadData()
         })
-        // this.$router.push({
+      } else {
-        //   path: '/system/MessageDetails',
+        this.$message.warning(this.$t('PleaseSelectData'))
-        //   query: row
-        // })
-      },
-      handleDel() {
-        var that = this
-        if (this.selectedRowKeys.length > 0) {
-          that.$confirm({
-            content: that.$t('ConfirmBatchDeletion'),
-            onOk: function() {
-              let selectedRowKeys = JSON.parse(JSON.stringify(that.selectedRowKeys))
-              deleteAction(that.url.deleteUrl, { ids: selectedRowKeys.join(',') }).then((res) => {
-                if (res.success) {
-                  that.selectedRowKeys = []
-                  that.$message.success(that.$t('OperationSuccessful'))
-                  that.loadData()
-                } else {
-                  that.$message.warning(that.$t('operationFailed'))
-                }
-              })
-            }
-          })
-        } else {
-          this.$message.warning(this.$t('PleaseSelectData'))
-        }
       }
     }
   }
+}
 </script>
 <style scoped>
-  @import '~@assets/less/common.less';
+@import '~@assets/less/common.less';
 
-  .ant-card-body .table-operator {
+.ant-card-body .table-operator {
-    margin-bottom: 18px;
+  margin-bottom: 18px;
-  }
+}
 
-  .anty-row-operator button {
+.anty-row-operator button {
-    margin: 0 5px
+  margin: 0 5px
-  }
+}
 
-  .ant-btn-danger {
+.ant-btn-danger {
-    background-color: #ffffff
+  background-color: #ffffff
-  }
+}
 
-  .ant-modal-cust-warp {
+.ant-modal-cust-warp {
-    height: 100%
+  height: 100%
-  }
+}
 
-  .ant-modal-cust-warp .ant-modal-body {
+.ant-modal-cust-warp .ant-modal-body {
-    height: calc(100% - 110px) !important;
+  height: calc(100% - 110px) !important;
-    overflow-y: auto
+  overflow-y: auto
-  }
+}
 
-  .ant-modal-cust-warp .ant-modal-content {
+.ant-modal-cust-warp .ant-modal-content {
-    height: 90% !important;
+  height: 90% !important;
-    overflow-y: hidden
+  overflow-y: hidden
-  }
+}
 
-  .box-title-text {
+.box-title-text {
-    line-height: 1.4;
+  line-height: 1.4;
-    display: flex;
+  display: flex;
-    align-items: center;
+  align-items: center;
-    margin-bottom: 10px;
+  margin-bottom: 10px;
-  }
+}
 
-  .title-text {
+.title-text {
-    width: 20%;
+  width: 20%;
-    min-width: 90px;
+  min-width: 90px;
-    color: #000F16;
+  color: #000F16;
-    display: inline-block;
+  display: inline-block;
-    font-weight: 500;
+  font-weight: 500;
-    font-size: 14px;
+  font-size: 14px;
-    margin-right: 16px;
+  margin-right: 16px;
-    margin-top: 3px;
+  margin-top: 3px;
-    text-align: right;
+  text-align: right;
-    white-space: nowrap;
+  white-space: nowrap;
-    overflow: hidden;
+  overflow: hidden;
-    text-overflow: ellipsis;
+  text-overflow: ellipsis;
-  }
+}
 
-  .box-input {
+.box-input {
-    display: inline-block;
+  display: inline-block;
-    width: 70%;
+  width: 70%;
-    height: 38px;
+  height: 38px;
-    margin-top: 2px;
+  margin-top: 2px;
-  }
+}
 
-  .box-button {
+.box-button {
-    height: 38px;
+  height: 38px;
-    /*margin-top: 2px;*/
+  /*margin-top: 2px;*/
-  }
+}
 
-  ::v-deep .ant-table .ant-table-row-indent + .ant-table-row-expand-icon {
+::v-deep .ant-table .ant-table-row-indent + .ant-table-row-expand-icon {
-    margin-right: 0;
+  margin-right: 0;
-  }
+}
 </style>
 <style>
-  .box-input .ant-select-selection {
+.box-input .ant-select-selection {
-    height: 38px;
+  height: 38px;
-    line-height: 38px;
+  line-height: 38px;
-  }
+}
 
-  .box-input .ant-select-selection__rendered {
+.box-input .ant-select-selection__rendered {
-    line-height: 38px;
+  line-height: 38px;
-  }
+}
 </style>