Merge branch 'master' of http://git.lionquexpress.com/wuweihua/BMS

bms-front/src/views/ar/bill/components/GenerateBillDialog.vue

@@ -9,7 +9,7 @@
           <el-col :span="8">
             <el-form-item label="单号">
               <div class="order-identifier-input">
-                <el-input v-model="generateForm.orderOrTrackingNo" type="textarea" :rows="4" resize="vertical" placeholder="请输入订单号、运单号或转单号，每行一个，最多2000个" clearable />
+                <el-input v-model="generateForm.orderOrTrackingNo" type="textarea" :rows="4" resize="vertical" placeholder="请输入订单号、运单号或转单号" clearable />
                 <el-button v-if="generateForm.orderOrTrackingNo" class="order-identifier-clear" link type="primary" @click="clearOrderIdentifiers">清空</el-button>
               </div>
             </el-form-item>
@@ -96,7 +96,7 @@
     <el-dialog v-model="excludeDialogOpen" title="选择排除订单" width="1100px" append-to-body destroy-on-close @close="handleExcludeDialogClose">
       <div class="exclude-toolbar">
         <div class="order-identifier-input exclude-search-input">
-          <el-input v-model="excludeKeyword" type="textarea" :rows="4" resize="vertical" clearable placeholder="请输入订单号、运单号或转单号，每行一个，最多2000个" />
+          <el-input v-model="excludeKeyword" type="textarea" :rows="4" resize="vertical" clearable placeholder="请输入订单号、运单号或转单号" />
           <el-button v-if="excludeKeyword" class="order-identifier-clear" link type="primary" @click="clearExcludeIdentifiers">清空</el-button>
         </div>
         <el-button type="primary" :loading="excludeLoading" @click="queryExcludeRows">查询</el-button>

bms-front/src/views/index.vue

@@ -2,10 +2,10 @@
   <div class="app-container home">
     <div class="home-hero">
       <div class="hero-main">
-        <h2 class="hero-title">BMS 业务管理系统</h2>
+        <h2 class="hero-title">BMS 业财一体化系统</h2>
         <p class="hero-sub">跨境物流 · 询价计价 · 账单管理</p>
         <p class="hero-welcome">
-          {{ greeting }}，{{ user.nickName || user.name }}，欢迎使用 BMS 业务管理系统。
+          {{ greeting }}，{{ user.nickName || user.name }}，欢迎使用 BMS 业财一体化系统。
         </p>
         <p class="hero-date">{{ nowText }}</p>
       </div>